Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sun, 18 Mar 2012 22:30:44 +0000 (18:30 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sun, 18 Mar 2012 22:30:44 +0000 (18:30 -0400)
commitd9786544f4ec2b1f2da602633fe19c10e06664f5
treecdff06c1d2fe463a927a5b59bb9a47b05e604144
parentce21d9375a04410f11f79c9303bd86ebc29ab4da
parent71ad01ee5bbc2e4a50eb7d3bda78926569bc1411
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

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

* master: