Merge branch 'master' of git://github.com/civicrm/civicrm-core
authorStoob <stuart@korlon.com>
Thu, 2 May 2013 23:18:52 +0000 (16:18 -0700)
committerStoob <stuart@korlon.com>
Thu, 2 May 2013 23:18:52 +0000 (16:18 -0700)

Trivial merge