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)
commit578241e238851ac58c6483b3986e471b7262ccf2
treeadf827925c57b04f26ee9f886c5345aa248cca8a
parent340bfa03e48e1d44406b15bf3177add0933f2429
parentef8bfc1f7ebb4f8bc6c9bd0e7747cce98dc15c80
Merge branch 'master' of git.acceleration.net:/var/git/clsql