]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sun, 25 Mar 2012 21:06:17 +0000 (17:06 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sun, 25 Mar 2012 21:06:17 +0000 (17:06 -0400)
commit38b30c1d10c83900e18c2b2440ac61a984a60bf3
treed1f8a808d45f16c5f9b4eb016a2276eb797850f3
parentbaeb7353153924489d8d79a36d9b21c28c5f2ac4
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  small fixes
  enotify plugin hook
  NOTIFY_SYSTEM

* master: