From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 15 Apr 2012 04:40:21 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=adc932a5e2fc85fc659fe738e4f1316e039e9f00;p=friendica.git

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

* remotes/upstream/master:
  diabook-themes: added js for auto-growing comment-textareas
  diabook: theme-settings: add a wide-option
  Another bunch of executable permission removal
  Removed execution permission: lintian warning in Debian packaging

* master:
---