commit 554b3ed39ad385d07034951fa8e8ca700436ead0 Merge: 3b07928 71b1953 Author: Caleb Maclennan <caleb at pld-linux.org> Date: Mon Aug 6 14:17:48 2012 +0300 Merge branch 'master' of git://git.pld-linux.org/packages/i3 Conflicts: i3.spec ---