Merge branch 'master' of git://repo.or.cz/alt-git
commitc3ace75dc0645909dcb546012e5158464cdb4b1f
authorJohannes Sixt <j6t@kdbg.org>
Sat, 27 Aug 2011 19:36:47 +0000 (27 21:36 +0200)
committerJohannes Sixt <j6t@kdbg.org>
Sat, 27 Aug 2011 19:36:47 +0000 (27 21:36 +0200)
tree024d0f052f0b5ae35f80fef880332c72bc552f79
parentf56345720f60d6baf0f90691bd05a0e51a8797e1
parenta452d148d10a89ae502bc4755c191ab323227ce5
Merge branch 'master' of git://repo.or.cz/alt-git