Merge branch 'master' of git://repo.or.cz/alt-git
commit382086f47a0c0739b257315465bb1e082c74376a
authorJohannes Sixt <j6t@kdbg.org>
Thu, 14 Mar 2013 06:27:25 +0000 (14 07:27 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Thu, 14 Mar 2013 06:27:25 +0000 (14 07:27 +0100)
tree4e0b74db455422fc61014691e9752fbd55aea3a6
parent503274a12a8914c42aefed8eb33f6a810059457b
parent239222f587ed06f96d90dd71c66d80a2b1e3dc9f
Merge branch 'master' of git://repo.or.cz/alt-git