Merge branch 'master' of git://repo.or.cz/alt-git
commitd25c36b5b51d9d6d74ba0fa5ade8e19e8e7a6b06
authorJohannes Sixt <j6t@kdbg.org>
Sun, 26 Feb 2012 13:31:31 +0000 (26 14:31 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Sun, 26 Feb 2012 13:31:31 +0000 (26 14:31 +0100)
tree2873ee68351fcda3b500bb2b011380ca617a10fe
parent7b9120862e821e1159e25d9bd9f01296432034ad
parentba998d33e22d6fce4445af5834dc227609672501
Merge branch 'master' of git://repo.or.cz/alt-git