From: Michael <icarus@dabo.de>
Date: Mon, 18 Jun 2012 06:51:12 +0000 (+0200)
Subject: Merge branch 'master' of github.com:annando/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6eaca19f4195a5f8f2c1b6b1e51c6e52bad67d96;p=friendica.git

Merge branch 'master' of github.com:annando/friendica

Conflicts:
	include/oembed.php
---

6eaca19f4195a5f8f2c1b6b1e51c6e52bad67d96