Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 21 Jan 2014 20:28:21 +0000 (21:28 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 21 Jan 2014 20:28:21 +0000 (21:28 +0100)
commit63e464108af57afa166d59a574479d5309cc4d9c
tree450b0e6a5fa36b415bec5024f0ec0416a74e3c65
parent691c6e859b97b00b6106fa46f42cbdd45f01a8a9
parent834a34843cc4a925cd624088caccfa9bd17b346f
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel