Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Wed, 13 Feb 2013 15:01:23 +0000 (10:01 -0500)
committerEvan Prodromou <evan@status.net>
Wed, 13 Feb 2013 15:01:23 +0000 (10:01 -0500)
commitcc8594748023aceb2b4d02d1baa3687fbc34b0f9
treecf585868754573862a645561476ec60bb0af95f2
parentbcba3e68a37cd2908a5fb5e8106a38352d3f8ee0
parent6f424eb80f49d1e7f3c8128126fbe9a63cb502ad
Merge branch 'master' of gitorious.org:statusnet/mainline