Merge branch 'master' of git://repo.or.cz/alt-git
commitbed6d3392d6f79830fc45a09c2a1769490aec735
authorJohannes Sixt <j6t@kdbg.org>
Fri, 18 Oct 2013 06:11:16 +0000 (18 08:11 +0200)
committerJohannes Sixt <j6t@kdbg.org>
Fri, 18 Oct 2013 06:11:16 +0000 (18 08:11 +0200)
tree4187b7622192348de6653abb885ce933f3d7e80f
parent6960dbb3a88547b22f520e9714742535ecf02863
parent2141c474d0dd7cddf224780644e64bc7fa493f07
Merge branch 'master' of git://repo.or.cz/alt-git