projects / KiwiIRC.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f1c52ab 7835443)
Merge remote-tracking branch 'upstream/development' into tonytrunk
authortonymke <tony.lechner@gmail.com>
Fri, 23 May 2014 23:41:45 +0000 (18:41 -0500)
committertonymke <tony.lechner@gmail.com>
Fri, 23 May 2014 23:41:45 +0000 (18:41 -0500)

Trivial merge