]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 27 Feb 2012 14:08:48 +0000 (09:08 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 27 Feb 2012 14:08:48 +0000 (09:08 -0500)
commitb1cdc5a93273f7536cb1a3c9870214f6d0aaaed0
tree5b4f1d296723fdbbef6da28e67fc4c65c79e538e
parenta33031634efef94c0985cd2517f10ccd36b40b5f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  fixed syntax errors
  add plugin hooks to enotify

* master: