]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Thu, 8 Mar 2012 03:30:46 +0000 (22:30 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Thu, 8 Mar 2012 03:30:46 +0000 (22:30 -0500)
* remotes/upstream/master:
  still getting parent relays on remote systems
  revup

* master:


No differences found