Merge pull request #82 from alhashash/ocb-7.0-fix_conflict_3e1d5be951
authorPedro M. Baeza <pedro.baeza@gmail.com>
Fri, 7 Nov 2014 02:33:08 +0000 (03:33 +0100)
committerPedro M. Baeza <pedro.baeza@gmail.com>
Fri, 7 Nov 2014 02:33:08 +0000 (03:33 +0100)
commitfccea9a09209c1a4b28b8fb92cf9e3a04f8fe2df
tree61984c9eb6e8e2769dba4d2c8baf6f8914421256
parent9ecdbc5626311e85dd1371dfee2fa80e91defe20
parent670c6b4d14b737fa3d8e5d867b503e54fc1e1cb2
Merge pull request #82 from alhashash/ocb-7.0-fix_conflict_3e1d5be951

[FIX] Fix incorrect merge 3e1d5be951fb8