]> git.mxchange.org Git - friendica.git/commit
Merge remote branch 'upstream/master'
authorHauke Zuehl <hzuehl@phone-talk.de>
Sat, 16 Jun 2012 16:04:59 +0000 (18:04 +0200)
committerHauke Zuehl <hzuehl@phone-talk.de>
Sat, 16 Jun 2012 16:04:59 +0000 (18:04 +0200)
commitf9a40ccbdea69fc7ffcbdc87356d535c67371210
tree18eca4019eb8e64badb7035ab782b729b706cd64
parent1231dd72f02fdec59b78ed9a6408887c2ae0b8d4
parent4faf0e609fe03095069c7a4bcdfc3496e4a28627
Merge remote branch 'upstream/master'