Merge branch 'master' of git://repo.or.cz/alt-git
commita5caf4714e86da761065cd45faa0487a7e7eef93
authorJohannes Sixt <j6t@kdbg.org>
Sun, 16 Sep 2012 11:51:51 +0000 (16 13:51 +0200)
committerJohannes Sixt <j6t@kdbg.org>
Sun, 16 Sep 2012 11:51:51 +0000 (16 13:51 +0200)
tree35df34f04e864ecfb905553278db1bf6e3ed2000
parent14e98f8553cb18471d3acbe21591c602b7a47ca9
parent83379df0251243b5e1f328598bfdd39327766df3
Merge branch 'master' of git://repo.or.cz/alt-git