From: James Moger <james.moger@gitblit.com>
Date: Mon, 6 Oct 2014 13:54:08 +0000 (-0400)
Subject: Merge branch 'pr-6'
X-Git-Tag: v1.3.0~16
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=06c1374cfc17bdad621f6ad5154f4de08905da99;p=iciql.git

Merge branch 'pr-6'
---

06c1374cfc17bdad621f6ad5154f4de08905da99