Merge branch 'master' of git.acceleration.net:/var/git/clsql
authorRuss Tyndall <russ@acceleration.net>
Tue, 10 Jun 2014 15:26:27 +0000 (11:26 -0400)
committerRuss Tyndall <russ@acceleration.net>
Tue, 10 Jun 2014 15:26:27 +0000 (11:26 -0400)

Trivial merge