Commit 0edad3cc0451a42b566d70f64611acc214a03022

Vicent Marti 2013-04-22T16:41:56

Merge branch 'development' into vmg/dupe-odb-backends Conflicts: src/odb.c