Merge remote branch 'origin/develop' into haswell
authorwernsaar <wernsaar@googlemail.com>
Sun, 1 Dec 2013 15:19:30 +0000 (16:19 +0100)
committerwernsaar <wernsaar@googlemail.com>
Sun, 1 Dec 2013 15:19:30 +0000 (16:19 +0100)

Trivial merge