]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Tue, 29 Apr 2014 10:36:49 +0000 (12:36 +0200)
committerMichael Vogel <icarus@dabo.de>
Tue, 29 Apr 2014 10:36:49 +0000 (12:36 +0200)
commitc5825a0c20fe891425bb75f6f2547dbf9b5397f8
tree46c3d21472799a0cbb563fb6da9d4348f64c92a3
parent66996a2fa3bf8ad726f83df19a247ff006552aea
parentb69f6b6adeb178f6dd93c2e659d9712cdf4c441e
Merge remote-tracking branch 'upstream/master'