Merge branch 'master' of git://repo.or.cz/alt-git
commit717f9d8c25213858603dd96c417772cf8d9317b6
authorJohannes Sixt <j6t@kdbg.org>
Wed, 2 May 2012 06:05:35 +0000 (2 08:05 +0200)
committerJohannes Sixt <j6t@kdbg.org>
Wed, 2 May 2012 06:05:35 +0000 (2 08:05 +0200)
treea6912a3fe2b7335602ba2546786c107f93e9069c
parent56bad8c08febc0a55f0509fe7d77238ca69113b8
parent242cab397214b017ac837e870ac9950efc2968c3
Merge branch 'master' of git://repo.or.cz/alt-git