Merge branch 'master' of repo.or.cz:srv/git/calf
commit2ea5f9ef221d9a43fbfa8be10beffdc35a37ff28
authorMarkus Schmidt <schmidt@boomshop.net>
Mon, 29 Dec 2014 16:29:44 +0000 (29 17:29 +0100)
committerMarkus Schmidt <schmidt@boomshop.net>
Mon, 29 Dec 2014 16:29:44 +0000 (29 17:29 +0100)
tree1a1597c5085622afafef442fc1258d57379aab80
parentb147affab0fcff14841a2778bb2c9ec964ad1c5b
parent5800961ea11b44fee43f47690583180ad08ced03
Merge branch 'master' of repo.or.cz:srv/git/calf