]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
authorZach Copley <zach@status.net>
Wed, 3 Mar 2010 00:51:21 +0000 (16:51 -0800)
committerZach Copley <zach@status.net>
Wed, 3 Mar 2010 00:51:21 +0000 (16:51 -0800)
* 'testing' of gitorious.org:statusnet/mainline:
  OStatus: save file records for enclosures
  Changed the geo location cookie Expire to Session.


Trivial merge