Merge branch 'dev-1403208-new_roles' into 6.x-2.x
authorChristopher Gervais
Mon, 17 Jun 2013 20:11:09 +0000 (20:11 +0000)
committerChristopher Gervais
Mon, 17 Jun 2013 20:11:09 +0000 (20:11 +0000)
commit233e8abd2a1b66aae2e0b3da5b8867ab30e8431a
tree3b9dd72b0a3f820612b57e9384316470fd4d1b7f
parentbffa0c82508415ba0aef69668f1c8c26ecfc490f
parentc143497631ba3e14e82aeb63dd26bcd990b0940f
Merge branch 'dev-1403208-new_roles' into 6.x-2.x