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)
commit97cef3a7818ed072d96ef99b55aa879d500a3e31
tree28883e2dbfc219f1e8c5747053b77a206ff35ac2
parent9a0f5af9218e6e716a3eadbff7a08e3238bd0286
parentc66cae355c80acd0f5f3fbdbf3d440d0c283536c
Merge remote-tracking branch 'kalikaneko/add-assets' into develop