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

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

* remotes/upstream/master:
  diabook-theme: small fixes
  rename get_language() to get_browser_language()
  slackr drop shadows
  language detection library
  rev update

* master:
---

39c042f4ea33abd77d6431c531b6eae72f2d7994