Merge branch 'develop' into experimental experimental origin/experimental
authorDaniel Kochmański <jackdaniel@hellsgate.pl>
Sun, 12 Apr 2015 09:54:18 +0000 (11:54 +0200)
committerDaniel Kochmański <jackdaniel@hellsgate.pl>
Sun, 12 Apr 2015 09:54:18 +0000 (11:54 +0200)
commita26fdf69f23e6715258f050c04a7b724d9d071b8
treed0677f91af46ba03e2de6ba324e963973438ae94
parentac524ef08eb81dffcdcc3a25e4033176f7f3f251
parentb0e78cad8d91d550377493592f180557fd15b8be
Merge branch 'develop' into experimental