Merge branch 'master' of git://repo.or.cz/alt-git
commitc00f5f628c5a119cc5bfc71c7fda1dfef777f88d
authorJohannes Sixt <j6t@kdbg.org>
Sat, 28 Dec 2013 20:15:56 +0000 (28 21:15 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Sat, 28 Dec 2013 20:15:56 +0000 (28 21:15 +0100)
treee17aeb7a9b5ac3d0f9f261e333bc172fc75c13ec
parent46bd7815021c432e703e6b0279a8d6633c693d03
parent53f3478d42d00a34bfb031f41a4a9a3a225d312f
Merge branch 'master' of git://repo.or.cz/alt-git