Merge branch 'master' of git://github.com/civicrm/civicrm-core into fix-membership...
authorEffy Elden <git@effy.is>
Sun, 22 May 2016 07:01:56 +0000 (03:01 -0400)
committerEffy Elden <git@effy.is>
Sun, 22 May 2016 07:01:56 +0000 (03:01 -0400)

Trivial merge