]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorZach Copley <zach@status.net>
Wed, 16 Mar 2011 23:17:49 +0000 (16:17 -0700)
committerZach Copley <zach@status.net>
Wed, 16 Mar 2011 23:17:49 +0000 (16:17 -0700)
commit74387e75cf1f521bfdea0a8d635730ee6fb49d9d
tree281f079543748ab212b536b4b7c439724b821952
parent262126bd54627e37244185fbedce3e50cc41cf2f
parent306639c0f172b064253ac961b2e420ec11eb7e1c
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x