]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Thu, 10 May 2012 06:16:49 +0000 (02:16 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Thu, 10 May 2012 06:16:49 +0000 (02:16 -0400)
commit25d5eae9557527789b7237724b66fa88f9c44d6d
treee2a6f1dc347e5e238fcce2c87d17bdf1bafcebf3
parent39a7926015f06c96aeb3ae1439fdec97fc123c59
parent4a42414135538fedad53ba6a2bc46ae18d652609
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  rev update
  rev update

* master: