]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'event' into 1.0.x
authorEvan Prodromou <evan@status.net>
Wed, 9 Mar 2011 17:56:06 +0000 (12:56 -0500)
committerEvan Prodromou <evan@status.net>
Wed, 9 Mar 2011 17:56:06 +0000 (12:56 -0500)

Trivial merge