]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Thu, 24 Jul 2014 20:54:35 +0000 (22:54 +0200)
committerMichael Vogel <icarus@dabo.de>
Thu, 24 Jul 2014 20:54:35 +0000 (22:54 +0200)
commita588ae4022cf3715ac4801a8ed9633b1be1d3dfb
tree6c38cd5720e1ca697f631dcbd34c67361ac839aa
parente2f9ae397083710cd94b97296a925ebae7e28961
parent1940905454b311fc5999a0d8020832bb92ee52f5
Merge remote-tracking branch 'upstream/master'