n0.12-dev

Michael Niedermayer

@michaelni

c0b47d19 · Merge remote-tracking branch 'qatar/master' · May 25, 2012

Main development, master branch after release/0.11 branched off