Merge branch 'master' into libmv_prediction
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 23 Oct 2014 08:55:21 +0000 (10:55 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 23 Oct 2014 08:55:21 +0000 (10:55 +0200)

Trivial merge