Merge branch 'feature/smart-ptr'
authorIngo Ruhnke <grumbel@gmail.com>
Wed, 1 Oct 2014 16:43:48 +0000 (18:43 +0200)
committerIngo Ruhnke <grumbel@gmail.com>
Wed, 1 Oct 2014 16:43:48 +0000 (18:43 +0200)

Trivial merge