Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 3 May 2012 20:06:02 +0000 (22:06 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 3 May 2012 20:06:02 +0000 (22:06 +0200)
commit00514372bc3bd09268a8f6764fe5d7b50fce0c41
tree0147ab54e92f76cc6d96646451327d079600f90c
parent33c17e29507e0424f80dd56241f3026100a71433
parenteb08393cc2fff7672e3931e98b42b99f4ce6beda
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel