Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  revup
  CSRF-Protection in the group-related form (creating, renaming and dropping a group, adding/removing members from it)

* master:
This commit is contained in:
Simon L'nu 2012-03-18 21:09:25 -04:00
parent 02786d6ed0
commit 5e2a9c99a6

Diff content is not available