Issue #2214215 by david_garcia_garcia: Warning trying to acces property of non object.
rolled patch into release
Remove Mark Trapp as maintainer.
#1121924 by Mark Trapp: Allow the use of git checkouts of Context
Update requirements to latest release of Context
Prepare 6.x-3.x branch for release.
Stripping CVS keywords
Prepare CHANGELOG.txt for release
#1065802 by silloyd, Mark Trapp: Drupal install fails if Context: Menu Block is present
Update CHANGELOG.txt in preparation of release
#949984 by Mark Trapp: Port to Drupal 7.
Fix typo and minor code style issues.
Merge changes in the 6.x-3.x back to head
Remove hardcoded version from Context validation.
Replace version checking regexp with more robust expression.
Clean up code to match Drupal Coding Standards
Merge DRUPAL-6--3 branch back to HEAD in preparation of Drupal 7 port
Drupal is a registered trademark of Dries Buytaert.