Merge branch 'master' of git://repo.or.cz/alt-git
commit51c69e4526a02d1013182157cbd8bb0007342783
authorJohannes Sixt <j6t@kdbg.org>
Tue, 13 Jan 2015 06:28:01 +0000 (13 07:28 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Tue, 13 Jan 2015 06:28:01 +0000 (13 07:28 +0100)
tree3f82db4eaf8567aa5568d154ddb37c465d126ca4
parentce6602cb387f8088071fc89e7c40e0d585940c42
parentaddfb21a94fb4e6b9d07b270f7bb3748767a8f38
Merge branch 'master' of git://repo.or.cz/alt-git