]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - plugins/Msn/locale/Msn.pot
projects / quix0rs-gnu-social.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ff656a8 83c988e)
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
authorEvan Prodromou <evan@status.net>
Mon, 22 Aug 2011 15:25:13 +0000 (11:25 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 22 Aug 2011 15:25:13 +0000 (11:25 -0400)
commit0a17e7cf9f4983cf3e96b65c548c39dff0d80b72
tree9f9ebd27a39f6d9c10bb381d10d4739d5ea2737atree | snapshot
parentff656a8b3a26f977bfebfffc93acb7541f0992cccommit | diff
parent83c988e1e799861d007ef82ff575eefa3140ef33commit | diff
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x

Conflicts:
classes/Memcached_DataObject.php
classes/Memcached_DataObject.php diff1 | diff2 | blob | history
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)