Merge remote-tracking branch 'remotes/kalikaneko/bug/include_properties' into develop
authordrebs <drebs@leap.se>
Mon, 6 Jan 2014 16:57:31 +0000 (14:57 -0200)
committerdrebs <drebs@leap.se>
Mon, 6 Jan 2014 16:57:31 +0000 (14:57 -0200)
commit10a255d318d3126cbd10fe1b0c8284a223850603
treeb003fb627b78510687add199d454afd23b565303
parent9f5d0fbc6fd01ec610ba5353e9e99c4419685b45
parentb5945ca733c218da29b04bbe88c0f5b33ff385de
Merge remote-tracking branch 'remotes/kalikaneko/bug/include_properties' into develop