Merge branch 'master' into terencehill/slider_anim_improvements
authorterencehill <piuntn@gmail.com>
Sat, 5 Sep 2015 10:42:06 +0000 (12:42 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 5 Sep 2015 10:42:06 +0000 (12:42 +0200)
commit28305c2245f99ca5ae21ea8858e05c6bb0a2000b
tree8e150b1c8e55675268045584a982051a5dd097f5
parentb41b1b47e0f20ed2d30358311ba111d82da56f54
parenta240e0309a8ec5837f3ac3d37c168f5262e53d5b
Merge branch 'master' into terencehill/slider_anim_improvements