Merge branch 'feature/addon-manager'
authorIngo Ruhnke <grumbel@gmail.com>
Mon, 25 Aug 2014 07:52:57 +0000 (09:52 +0200)
committerIngo Ruhnke <grumbel@gmail.com>
Mon, 25 Aug 2014 07:52:57 +0000 (09:52 +0200)

Trivial merge