From: Simon L'nu <simon.lnu@gmail.com>
Date: Thu, 18 Oct 2012 15:30:58 +0000 (-0400)
Subject: Merge remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6ee4e4a93d76ea33b61448fe7269aedaf217e8e7;p=friendica.git

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

* remotes/upstream/master:
  imagick exception
  rev update
  diabook: use proper defaults in popup sidebar config
  diabook boxes: use a common hide/show form entry definition
  remove lots of duplicated code in diabook config handling
---

6ee4e4a93d76ea33b61448fe7269aedaf217e8e7