]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
authorZach Copley <zach@status.net>
Thu, 5 Nov 2009 06:05:33 +0000 (22:05 -0800)
committerZach Copley <zach@status.net>
Thu, 5 Nov 2009 06:05:33 +0000 (22:05 -0800)
* '0.9.x' of gitorious.org:statusnet/mainline:
  Revert a OS X-specific change to PEAR MIME_Type that I accidentally commited.


Trivial merge