Merge branch 'master' of https://github.com/jedidja/dapper-dot-net into jedidja-master

Conflicts: Dapper.Rainbow/Database.cs

Merge branch 'master' of https://github.com/jedidja/dapper-dot-net into jedidja-master
Conflicts: Dapper.Rainbow/Database.cs
4a7e7fb5 · Marc Gravell · 4a9f0500 · 7919913c · 4a7e7fb5
Commit 4a7e7fb5 authored Aug 07, 2012 by Marc Gravell
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 256 additions and 255 deletions

Database.cs Dapper.Rainbow/Database.cs +256 -255

No files found.
--- a/Dapper.Rainbow/Database.cs
+++ b/Dapper.Rainbow/Database.cs