]> git.mxchange.org Git - friendica-addons.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Mon, 10 Dec 2012 22:34:28 +0000 (23:34 +0100)
committerMichael Vogel <icarus@dabo.de>
Mon, 10 Dec 2012 22:34:28 +0000 (23:34 +0100)

Trivial merge