Merge remote-tracking branch 'kalikaneko/add-assets' into develop
authordrebs <drebs@leap.se>
Mon, 28 Oct 2013 20:12:19 +0000 (18:12 -0200)
committerdrebs <drebs@leap.se>
Mon, 28 Oct 2013 20:12:19 +0000 (18:12 -0200)

Trivial merge