Merge branch 'master' of git://repo.or.cz/alt-git
commit5815d488d4673ea652be207add27c3b6ea49de32
authorJohannes Sixt <j6t@kdbg.org>
Fri, 2 May 2014 09:30:25 +0000 (2 11:30 +0200)
committerJohannes Sixt <j6t@kdbg.org>
Fri, 2 May 2014 09:30:25 +0000 (2 11:30 +0200)
tree9abc681f96017ae0a32c760ac29d3c6aeb227a0d
parent3e1b81122b535189d4ed7269777c6cf6e96fa499
parent7e76a2f97546444fe7a2af18825450e29c3622a4
Merge branch 'master' of git://repo.or.cz/alt-git