projects / KiwiIRC.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f9f212b 2a89ba1)
Merge remote-tracking branch 'upstream/development' into tonytrunk
authortonymke <tony.lechner@gmail.com>
Sat, 17 May 2014 20:56:41 +0000 (15:56 -0500)
committertonymke <tony.lechner@gmail.com>
Sat, 17 May 2014 20:56:41 +0000 (15:56 -0500)

Trivial merge