Merge remote-tracking branch 'origin/master' into pinch

Conflicts:
	examples/widgets/scale.dart
This commit is contained in:
Collin Jackson 2015-09-16 17:58:38 -07:00
commit b50c015f33

Diff Content Not Available