Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Fri, 23 Dec 2011 19:04:13 +0000 (20:04 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Fri, 23 Dec 2011 19:04:13 +0000 (20:04 +0100)
commit88ce429160c3a4309df55bfa3abdf31154cbe2db
tree1c742d863d25703bab70e019225c3a3e87513cdd
parent89e1a0f46082894132a09bd7e6401ee0ef1b013c
parent77e22b6bbcf9fa8c690ad3872f9a65d969d45335
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel