]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'newmenuplugin' into testing
authorEvan Prodromou <evan@status.net>
Sat, 8 Jan 2011 00:28:18 +0000 (19:28 -0500)
committerEvan Prodromou <evan@status.net>
Sat, 8 Jan 2011 00:28:18 +0000 (19:28 -0500)

Trivial merge