Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 8 Mar 2012 22:37:00 +0000 (23:37 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 8 Mar 2012 22:37:00 +0000 (23:37 +0100)
commit7da250e1c674a7f08080afe2a3b95d2c51617500
tree6cf4c578a2f6876a0dc60a66ca589145be34182f
parentecb8ad74c61e3a97057f5796b2e24f7b9b4a4a2f
parentb7f041eb172797015fd1ebc63e98bce58ea6637d
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel