Merge branch 'master' of gitorious.org:irctk/irctk
authorAntoine Amarilli <a3nm@a3nm.net>
Wed, 18 Jun 2014 13:45:55 +0000 (15:45 +0200)
committerAntoine Amarilli <a3nm@a3nm.net>
Wed, 18 Jun 2014 13:45:55 +0000 (15:45 +0200)
commitc43931fce96f31c242b5c5dc0d07e36ddc857ff6
treea6c473584d13073a5d800851cdcc8ac6cf44a7e6
parent67bd692de5fa2a630eff7a25522c9877745e6c2b
parentbf746b0f0e28dc4d3a26b6fb68890d76966a4f9d
Merge branch 'master' of gitorious.org:irctk/irctk

Conflicts:
irctk.c
README