Merge branch 'master' of git.acceleration.net:/var/git/clsql
authorRyan Davis <ryan@acceleration.net>
Tue, 31 Jul 2012 13:52:49 +0000 (09:52 -0400)
committerRyan Davis <ryan@acceleration.net>
Tue, 31 Jul 2012 13:52:49 +0000 (09:52 -0400)

Trivial merge