Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Sat, 26 Nov 2011 15:21:12 +0000 (10:21 -0500)
committerEvan Prodromou <evan@status.net>
Sat, 26 Nov 2011 15:21:12 +0000 (10:21 -0500)
commit600a718a3374f93aa3ea00f8d684b3c205f9c76a
tree4ea2fa1bd7dbfd3a4fe84543f3dc0dc093a5eba5
parent7af29bf0d28d363ff199e1aea199531d9881bc60
parent68676ad31da00f8b5bdade22eb3a07f52a3c976a
Merge branch 'master' of gitorious.org:statusnet/mainline