Ian Gilman 735fcc3e37 Merge branch 'master' into collections
fixed Conflicts:
	src/navigator.js
	src/openseadragon.js
2015-01-22 11:15:45 -08:00
..
2014-11-19 16:52:33 -08:00
2014-11-19 16:52:33 -08:00
2014-11-20 11:51:24 -08:00
2014-11-19 16:52:33 -08:00
2014-11-19 16:52:33 -08:00
2014-11-20 16:02:02 -08:00
2014-11-19 16:52:33 -08:00
2014-11-20 11:51:24 -08:00
2014-12-02 13:29:52 -08:00
2014-11-20 16:02:02 -08:00
2014-11-19 16:52:33 -08:00
2014-11-19 16:52:33 -08:00
2015-01-02 14:25:42 -08:00
2014-12-02 11:44:02 -08:00