]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Fri, 26 Dec 2014 17:08:08 +0000 (18:08 +0100)
committerMichael Vogel <icarus@dabo.de>
Fri, 26 Dec 2014 17:08:08 +0000 (18:08 +0100)
commit3908b9172d838e19f69c7d71ae3b7eb4d9c64871
tree3c5afd482eb9653968a01a7051f62255fb4e80e6
parent0cafc59f1b59ce361911d3d3a3ca2640671a21e4
parentd10c8ddf570b880cdf0f5d391e98d144171bec64
Merge remote-tracking branch 'upstream/master'