Merge branch 'master' of http://git.kpe.io/clsql
authorRuss Tyndall <russ@acceleration.net>
Sun, 17 Jan 2016 17:36:00 +0000 (12:36 -0500)
committerRuss Tyndall <russ@acceleration.net>
Sun, 17 Jan 2016 17:36:00 +0000 (12:36 -0500)

Trivial merge