From: Nathan Bird <nathan@acceleration.net>
Date: Tue, 2 Mar 2010 23:24:32 +0000 (-0500)
Subject: Merge branch 'master' into development
X-Git-Tag: v5.0.5~8
X-Git-Url: http://git.kpe.io/?a=commitdiff_plain;h=96cc4dd98e77b8a1f83fa850e3348219c957b7ef;hp=406feeb749bb475bec8077a2716a5b6089bd9072;p=clsql.git

Merge branch 'master' into development
(appears to be spurious, should be the same as 406feeb749bb475bec8077a2716a5b6089bd9072)
---