Mark Salsbery 1c17ea8afa Merge branch 'master' into Pinch-Zoom-Fix
Conflicts:
	changelog.txt
2013-10-07 08:44:29 -07:00
..
2013-09-26 09:50:26 -07:00
2013-06-19 13:33:27 -04:00
2013-09-30 10:22:06 -07:00
2013-09-26 10:23:00 -07:00
2013-06-20 15:12:54 -04:00
2013-06-19 13:33:27 -04:00
2013-06-20 13:15:04 -07:00
2013-06-20 13:15:04 -07:00
2013-09-26 10:16:10 -07:00
2013-06-19 13:33:27 -04:00
2013-06-19 13:33:27 -04:00
2013-09-30 10:22:06 -07:00