Merge branch 'master' into permissions
authorAntony Chazapis <chazapis@gmail.com>
Fri, 10 Feb 2012 10:52:01 +0000 (12:52 +0200)
committerAntony Chazapis <chazapis@gmail.com>
Fri, 10 Feb 2012 10:52:01 +0000 (12:52 +0200)

Trivial merge