Merge branch 'master' of repo.or.cz:srv/git/calf
commite8bbfd617e1b53adb2eb79c5857343207c362bc8
authorMarkus Schmidt <schmidt@boomshop.net>
Tue, 6 Jan 2015 02:58:11 +0000 (6 03:58 +0100)
committerMarkus Schmidt <schmidt@boomshop.net>
Tue, 6 Jan 2015 02:58:11 +0000 (6 03:58 +0100)
tree5e0a17c5e93735935b334940f1d2f38f4ab09879
parenta089e854f8798199e3857b5e8e6810d32df02e87
parent04e0df8f5aa12f090ed48a2e3e5424992093c386
Merge branch 'master' of repo.or.cz:srv/git/calf