Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Tue, 25 Oct 2011 13:42:16 +0000 (09:42 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 25 Oct 2011 13:42:16 +0000 (09:42 -0400)
commitcb819f28cbf56461a77d14018a099d256acce4ec
tree1f5423ed6667be423b6b7b604ba2c4365273bfd5
parentec20544baf9e14de6f852e3c0cf1ebe7fece418f
parent679361652132f4b85f14a838b273d5415d3e6d22
Merge branch 'master' of gitorious.org:statusnet/mainline