tree b843b66969ed85208b458cf58fb3c9bd04aa3a9b
parent 79b8a086187f199bb708bd56477850fbf1dd9e91
parent e8de9eb4a8bba7cde0d81fe8571bcceed7aef77b
author Andrey Andreev <narf@devilix.net> 1452169221 +0200
committer Andrey Andreev <narf@devilix.net> 1452169221 +0200

Merge branch 'feature/oci_offset' into 3.0-stable