]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 28 Feb 2012 02:08:19 +0000 (21:08 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 28 Feb 2012 02:08:19 +0000 (21:08 -0500)
* remotes/upstream/master:
  cleanup notify subject lines

* master:


Trivial merge