Merge remote branch 'refs/remotes/origin/merlijn/rcon2irc-fix'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 24 Aug 2010 03:30:51 +0000 (05:30 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 24 Aug 2010 03:30:51 +0000 (05:30 +0200)
commit731e4a4f460f11c87d562f30b5d43a953a9c96bb
treea35913e090f58e0e8acef9a41fa9966d0c0afc86
parent35ed544229b611cb3fc8b210c6f98c687f287912
parent3283e78f7f1d469fc131f901ead18b46ecc71146
Merge remote branch 'refs/remotes/origin/merlijn/rcon2irc-fix'