From: Simon L'nu <simon.lnu@gmail.com>
Date: Tue, 10 Apr 2012 06:49:34 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=61c28e8c2ee5c80c162e0ea7b8fec10e26790641;p=friendica.git

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  rev update
  source beautifarming to make review easier
  fixed some typos
  made exceptions from the db optional set address for updae mails correctly
  added exceptions to dba class added exception handling to index.php, please mind that there is no recovery at the moment added transactions to db update. Please mind that they might not be supported by db table engines. added admin email on failed updates

* master:
---

61c28e8c2ee5c80c162e0ea7b8fec10e26790641