Merge branch 'master' of git://repo.or.cz/alt-git
commit1340f847f3eade894272c0bf0512f18fac73cb9e
authorJohannes Sixt <j6t@kdbg.org>
Sun, 14 Nov 2010 16:41:10 +0000 (14 17:41 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Sun, 14 Nov 2010 16:41:10 +0000 (14 17:41 +0100)
tree083e265f1c6c8ff08bffe354016f762667d2d4cd
parentf09aa1c869fe5a142f650c7f5ce3514d916ad4ad
parent6f10c4103dc7506623f89520ad03517b40788259
Merge branch 'master' of git://repo.or.cz/alt-git