]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into 1501-enhanced-poco
authorMichael Vogel <icarus@dabo.de>
Sun, 4 Jan 2015 20:07:45 +0000 (21:07 +0100)
committerMichael Vogel <icarus@dabo.de>
Sun, 4 Jan 2015 20:07:45 +0000 (21:07 +0100)

Trivial merge