]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 6 Mar 2012 23:15:45 +0000 (18:15 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 6 Mar 2012 23:15:45 +0000 (18:15 -0500)
commit94d4cad701ab6b618afb288c88165c0ec17ae238
tree268d94b48d28ba60d8e79003fa14ff903a070ee3
parent009a826a4918b3d1e9feaf74e482b408f366ba41
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  string update
  [PRIVACY] privacy issue bug #314

* master: