]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sat, 14 Apr 2012 05:34:25 +0000 (01:34 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sat, 14 Apr 2012 05:34:25 +0000 (01:34 -0400)
commit16f729912a00cc92d0473f3d326080531a2fb393
tree68a3e0c1d0f3bb627b2c6f7502b27909952aa969
parent7c63ca8364c15102e4c4dfb1718d2887c4d1c5dd
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

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

* master: