Merge branch 'master' of git://repo.or.cz/alt-git
commit803099b1204af28616e92486059b86c6f417c3a4
authorJohannes Sixt <j6t@kdbg.org>
Tue, 27 Aug 2013 10:14:23 +0000 (27 12:14 +0200)
committerJohannes Sixt <j6t@kdbg.org>
Tue, 27 Aug 2013 10:14:23 +0000 (27 12:14 +0200)
tree7b6bfd8d82d409b71f56cb7efba91c64a7768ac1
parentd3e25cb05b3423f5c64f96309a43683f61ad6b1a
parente230c568c4b9a991e3175e5f65171a566fd8e39c
Merge branch 'master' of git://repo.or.cz/alt-git