Merge branch 'master' of ssh://git.code.sf.net/p/yap/odbc
Conflicts: odbc.c
Authored by: Vítor Santos Costa 2015-01-06
Parents: [997245][cd7db3]