Evan Prodromou 59043dca7f Merge commit 'refs/merge-requests/164' of git://gitorious.org/statusnet/mainline into merge-requests/164
Conflicts:
	classes/Avatar.php

I ignored the code in Avatar; it's a different patch.
2011-09-21 15:39:44 -04:00
..
2011-09-15 17:06:05 -04:00
2011-04-08 01:22:02 +02:00
2011-09-18 19:20:28 -04:00