Merge branch 'master' into 1.2.x
authorEvan Prodromou <evan@status.net>
Mon, 9 Jul 2012 13:37:00 +0000 (09:37 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 9 Jul 2012 13:37:00 +0000 (09:37 -0400)
commit9c6f8e947427f5e38cc98d8ab1dd261590cef0d8
tree5a42f8cfd7568593a4779d7ce44c532296a7eef8
parente1a5f20a65d676a0ce961372812e5374a6546ecb
parentdad72cce28866d7a95926d97378c20aa3eff9150
Merge branch 'master' into 1.2.x

Conflicts:
classes/Profile.php
classes/User_group.php
lib/framework.php