commit c9d1eb1e028b64a612de80bd701cb0c795fd5b2d parent ac1c2d31bff37b0f0e1c3cce063121a1674f31c3 Author: Taiyu <taiyu.len@gmail.com> Date: Wed, 12 Aug 2015 23:12:35 -0700 Merge branch 'master' of https://github.com/SirCmpwn/sway keeping up with origin