Merge branch 'master' of repo.or.cz:srv/git/calf
commitb96b8001b4739d880489e10b3f1e32a071f7ca8c
authorMarkus Schmidt <schmidt@boomshop.net>
Tue, 3 Mar 2015 14:22:14 +0000 (3 15:22 +0100)
committerMarkus Schmidt <schmidt@boomshop.net>
Tue, 3 Mar 2015 14:22:14 +0000 (3 15:22 +0100)
tree5e882f4036e9293e3e64d802ababc8f594ef75ff
parent09d47b22439d9d4fb0652b30e7886efd1cb4651d
parentc55bdffa64d553ee7d0a0843416a3bbe8a8f86b0
Merge branch 'master' of repo.or.cz:srv/git/calf