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

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

* remotes/upstream/master:
  one more
  additional marital status selectors

* master:
---