]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sun, 21 Dec 2014 09:58:43 +0000 (10:58 +0100)
committerMichael Vogel <icarus@dabo.de>
Sun, 21 Dec 2014 09:58:43 +0000 (10:58 +0100)
commit57c3060855dcb26240a1d9ed54cf4715dd8dcc65
tree471fdc84012093b7e251e1ee5d8c87869a753f0a
parent774ee9c8c78687d8b61af361743c06319cde6cbd
parent6109c666abef73497f92e639396f10e333b69e76
Merge remote-tracking branch 'upstream/master'