]> git.mxchange.org Git - friendica.git/commit
Merge remote branch 'upstream/master'
authorHauke Zuehl <hzuehl@phone-talk.de>
Sat, 16 Jun 2012 17:49:04 +0000 (19:49 +0200)
committerHauke Zuehl <hzuehl@phone-talk.de>
Sat, 16 Jun 2012 17:49:04 +0000 (19:49 +0200)
commitcc7d849ce393a57fe6bb347c48c9a02f7e483789
tree3017ea74f2da0d3c0b5a8fa3f01c3a8c5294865d
parentf9a40ccbdea69fc7ffcbdc87356d535c67371210
parent950dacbbddfdd7dbec2042cf3db7c083bd96bfbf
Merge remote branch 'upstream/master'