Merge branch 'master' of git://140.232.178.237/home/ian/public_html/gnu-social

author Sean Corbett <sean@gnu.org>

Sun, 5 Sep 2010 17:20:46 +0000 (13:20 -0400)

committer Sean Corbett <sean@gnu.org>

Sun, 5 Sep 2010 17:20:46 +0000 (13:20 -0400)
author Sean Corbett <sean@gnu.org>
Sun, 5 Sep 2010 17:20:46 +0000 (13:20 -0400)
committer Sean Corbett <sean@gnu.org>
Sun, 5 Sep 2010 17:20:46 +0000 (13:20 -0400)
diff --cc plugins/GNUsocialPhotos/actions/photoupload.php
Simple merge
author	Sean Corbett <sean@gnu.org>
	Sun, 5 Sep 2010 17:20:46 +0000 (13:20 -0400)
committer	Sean Corbett <sean@gnu.org>
	Sun, 5 Sep 2010 17:20:46 +0000 (13:20 -0400)