Merge branch 'feature/c++11'
authorIngo Ruhnke <grumbel@gmail.com>
Mon, 4 Aug 2014 01:31:21 +0000 (03:31 +0200)
committerIngo Ruhnke <grumbel@gmail.com>
Mon, 4 Aug 2014 01:31:21 +0000 (03:31 +0200)

Trivial merge