projects / KiwiIRC.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e35f86f 9c847c3)
Merge branch 'master' into development
authorJack Allnutt <m2ys4u@gmail.com>
Tue, 4 Jun 2013 23:35:29 +0000 (00:35 +0100)
committerJack Allnutt <m2ys4u@gmail.com>
Tue, 4 Jun 2013 23:35:29 +0000 (00:35 +0100)

Trivial merge