Merge remote-tracking branch 'origin/master' into flexible-build-script

This commit is contained in:
John Gallagher
2015-12-07 11:15:21 -05:00
7 changed files with 302 additions and 12 deletions

View File

@@ -9,4 +9,5 @@ rusqlite contributors (sorted alphabetically)
* [Patrick Fernie](https://github.com/pfernie)
* [Steve Klabnik](https://github.com/steveklabnik)
* [krdln](https://github.com/krdln)
* [Ben Striegel](https://github.com/bstrie)
* [Andrew Straw](https://github.com/astraw)