Merge commit 'refs/merge-requests/11' of git://gitorious.org/irker/irker into merge...
authorEric S. Raymond <esr@thyrsus.com>
Wed, 3 Oct 2012 22:17:39 +0000 (18:17 -0400)
committerEric S. Raymond <esr@thyrsus.com>
Wed, 3 Oct 2012 22:17:39 +0000 (18:17 -0400)
1  2 
irkerd
irkerhook.py

diff --cc irkerd
Simple merge
diff --cc irkerhook.py
Simple merge