Switching to Flux theme on installation and overriding some forms
updating to alpha releases for Pushtape modules/themes
Entity API security update
Drupal core update 7.19
Colorbox update
Update Colorbox to 2.2
updating out of date modules
Adding soundmanager2 library and module
Typo in drupal-org.make file
Switching soundmanager2 external library method from git to get
Trying a different URL for soundmanager2 library, last two attempts not building correctly on d.o.
dev branch should use dev versions of other pushtape modules/theme
Trying another soundmanager2 URL due todrupalorgmakebot git bug
use dev versions. add patches
Merge branch '7.x-1.x' of https://github.com/discipolo/pushtape into 7.x-1.x

Conflicts:
	drupal-org.make