n1.2-dev

Michael Niedermayer

@michaelni

a2aeaff4 · Merge commit 'aa15afb7' · Jan 06, 2013

Main development, master branch after release/1.1 branched off