n2.6-dev

Michael Niedermayer

@michaelni

f478bdab · Changelog: add 2.5 entry · Dec 04, 2014

Main development, master branch after release/2.4 branched off