Merge branch 'master' of repo.or.cz:srv/git/calf
commit933d65834a715337c479ef1e2003ab10d1d2bbeb
authorMarkus Schmidt <schmidt@boomshop.net>
Wed, 14 Jan 2015 01:12:45 +0000 (14 02:12 +0100)
committerMarkus Schmidt <schmidt@boomshop.net>
Wed, 14 Jan 2015 01:12:45 +0000 (14 02:12 +0100)
tree27a6cb4f6d7d975e34c1e54bd6ea38ceca1f722b
parent6248c621715b158a631f9d91925c5bbdeca586bd
parenta2b8557b93b490756de116c8a055e29c3281a8cf
Merge branch 'master' of repo.or.cz:srv/git/calf