]> git.mxchange.org Git - friendica-addons.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sun, 3 Mar 2013 23:05:47 +0000 (00:05 +0100)
committerMichael Vogel <icarus@dabo.de>
Sun, 3 Mar 2013 23:05:47 +0000 (00:05 +0100)

Trivial merge