mirror of https://github.com/etcd-io/bbolt.git
Merge branch 'master' of https://github.com/boltdb/bolt
Conflicts: db_test.go rwtransaction_test.gopull/34/head
commit
092b63f25e
Conflicts: db_test.go rwtransaction_test.gopull/34/head