]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
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)
commit2149168d2995da0b89ee9eb6875d3899e04c783b
tree6a5de0e301a6bebaff5c6ea3c796820a5918d57e
parentf28795656f9250707b2180c93fe9946d5066017b
parent40bf174c0175df2d2de604f6887b90760faab74e
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

* '0.9.x' of gitorious.org:statusnet/mainline:
  Revert a OS X-specific change to PEAR MIME_Type that I accidentally commited.