Commit before merge
Merge branch '7.x-1.x' of https://github.com/coldfrontlabs/drupalcamp_zen into 7.x-1.x
Merge branch '7.x-1.x' of https://github.com/coldfrontlabs/drupalcamp_zen into 7.x-1.x
Merge branch '7.x-1.x' of https://github.com/coldfrontlabs/drupalcamp_zen into 7.x-1.x
Commit before merge
Merge branch '7.x-1.x' of https://github.com/coldfrontlabs/drupalcamp_zen into 7.x-1.x
Commit before merge
Merge changes to header