Merge branch 'develop-ascraeus' into develop

# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
  [ticket/12694] Remove whitespace at end of line from acp_groups
This commit is contained in:
Dhruv 2014-06-11 22:44:35 +05:30
commit 464a1190ea