Merge branch 'master' into windows-min-max-animation
authorFrank Hale <frankhale@gmail.com>
Tue, 11 Nov 2014 18:08:27 +0000 (13:08 -0500)
committerFrank Hale <frankhale@gmail.com>
Tue, 11 Nov 2014 18:08:27 +0000 (13:08 -0500)
commit070d26e68e3e6ba69f4bd3b44152ef3b4bf4776f
tree62b8dce36a97fa0be3d6462775f13afbb86978e6
parent24f8c5195986ef991ba949bec4b2da9deaf3ef23
parentaba3b721c5fb5b9ae34875fc7aa18be5d650b545
Merge branch 'master' into windows-min-max-animation