Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 3 Jul 2012 20:24:01 +0000 (22:24 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 3 Jul 2012 20:24:01 +0000 (22:24 +0200)
commit7821b09d65bd6cce17cf2037df4216abd9efcaf9
treeecf5858ed9217fe793745f2dc7ab7b3b01a75369
parent048b9feb7c326064d7444901f5d940d5fa544f6f
parent18fe146b44d5c852e81b9c0d41a33650fc215689
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel