Merge branch 'master' into terencehill/slider_anim_improvements
authorterencehill <piuntn@gmail.com>
Wed, 2 Sep 2015 17:26:30 +0000 (19:26 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 2 Sep 2015 17:26:30 +0000 (19:26 +0200)
commit688276421e89bb47394a765b2b242f81da1d4228
treed2b50cd13b5149322cb972b1e6cb652f2bffadd4
parent08e6497842b33529d0c1b0caa431b49ca98d79da
parentb822740ca8df332014ffcb6c62d3aee87f636925
Merge branch 'master' into terencehill/slider_anim_improvements