closes #6234
authorradhika <radhika@curoverse.com>
Fri, 26 Jun 2015 14:36:08 +0000 (10:36 -0400)
committerradhika <radhika@curoverse.com>
Fri, 26 Jun 2015 14:36:08 +0000 (10:36 -0400)
Merge branch '6234-user-edit-self'


Trivial merge