Merge remote-tracking branch 'remotes/sbraz/pymediainfo'
authorIan Delaney <idella4@gentoo.org>
Sat, 6 Feb 2016 12:34:28 +0000 (20:34 +0800)
committerIan Delaney <idella4@gentoo.org>
Sat, 6 Feb 2016 12:34:28 +0000 (20:34 +0800)
commit73665243b8bf6e9174f27dd1dcf02b998af621f5
tree8b622aa7c3c942c663e8ac9418f6aca5f4b53456
parentc2553ee0f3cdfdd7d2f9db5e7029ab2b30a9044f
parent084d3921f0e2d35933d8d3f7bf01ea9bdf69d318
Merge remote-tracking branch 'remotes/sbraz/pymediainfo'

Pull request: https://github.com/gentoo/gentoo/pull/801