Merge branch 'master' into terencehill/tooltips_cleanup
authorterencehill <piuntn@gmail.com>
Sat, 3 Oct 2015 20:47:15 +0000 (22:47 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 3 Oct 2015 20:47:15 +0000 (22:47 +0200)
commit32ca966802c45c4c231210c2d8776bc3f4135dc2
tree076d1805511d3a7ac09a480f696de18aa117e20c
parentd666ce9b927add9e9c0b4751ca8ac7a9780ea478
parentd9f919fe197a7e018ff73bdb03c45240face533e
Merge branch 'master' into terencehill/tooltips_cleanup