Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorEvan Prodromou <evan@status.net>
Thu, 14 Apr 2011 22:28:03 +0000 (18:28 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 14 Apr 2011 22:28:03 +0000 (18:28 -0400)
commit41dc9ca497dd065d72440cb2c706038f191a2c0c
tree308dc2a3e8e1726a32367e6819a606863d339e43
parent3df69fe5ba4cabf4879629a6039a862a50e5ef7e
parent70c8de4354d9134154ad84a0b041d778ed3ece1c
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

Conflicts:
classes/Profile.php
classes/Profile.php