Merge branch 'master' of git://repo.or.cz/alt-git
commitb159684d248d39c248d451391c9a7f886cf23310
authorJohannes Sixt <j6t@kdbg.org>
Thu, 31 Oct 2013 06:38:11 +0000 (31 07:38 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Thu, 31 Oct 2013 06:38:11 +0000 (31 07:38 +0100)
tree4a684e77f470d780c0da1a0a238015d6b12e0168
parent572cdfc812c5937d5ee49ae572590eba8659f7a4
parent42817b96b1b80b56fd5a4d5e0d6239524b1832a3
Merge branch 'master' of git://repo.or.cz/alt-git