]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into 1.0.x
authorEvan Prodromou <evan@status.net>
Tue, 2 Aug 2011 19:04:14 +0000 (15:04 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 2 Aug 2011 19:04:14 +0000 (15:04 -0400)
Conflicts:
lib/common.php

1  2 
README
lib/util.php
plugins/Meteor/MeteorPlugin.php

diff --cc README
Simple merge
diff --cc lib/util.php
Simple merge
Simple merge