]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorZach Copley <zach@status.net>
Tue, 12 Apr 2011 18:55:01 +0000 (11:55 -0700)
committerZach Copley <zach@status.net>
Tue, 12 Apr 2011 18:55:01 +0000 (11:55 -0700)
* '1.0.x' of gitorious.org:statusnet/mainline:
  Show both empty and full notice search results inside event wrapper
  More interesting test notices in createsim.php


Trivial merge