Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 26 May 2013 13:47:04 +0000 (15:47 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 26 May 2013 13:47:04 +0000 (15:47 +0200)
commit65fdf25a39d0ab07270233c1059c53e437c98639
tree5f53a4f32950a028112faaf4833b0ad3aa53d81b
parent15fc2bf9cd4d2a34fd91aa16c4f632ee46e72dd8
parent7ad51ac9cc164b9972a07296369e798862a26689
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel