From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 18 Mar 2012 22:30:44 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d9786544f4ec2b1f2da602633fe19c10e06664f5;p=friendica-addons.git

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  added comments and link to documentation to irc.php

* master:
---

d9786544f4ec2b1f2da602633fe19c10e06664f5