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)
commit5066ad643acd01cf885d1cc93ad5aa6466520de2
treefc260c158307240df3ae6ca28402c6f808ab92ee
parent8415881704a37021f29fe96a5852ff1e3f32bb06
parent2b303a8b914022a0145dffa40aec8c213c5f8623
Merge branch 'feature/addon-manager'