From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 2 Apr 2012 04:00:38 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d1638405a00d93f73103103af284b6f7bdc0329f;p=friendica-addons.git

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

* remotes/upstream/master:
  provide optional sitewide channel list
  improved irc with some alternate channel selections

* master:
---

d1638405a00d93f73103103af284b6f7bdc0329f