Merge remote branch 'remotes/origin/groupmanager'

This commit is contained in:
KHobbits 2012-03-23 17:44:00 +00:00
commit bb54dbb688