Merge pull request #6860 from monishdeb/46merge
authorKurund Jalmi <kurund@civicrm.org>
Wed, 30 Sep 2015 13:15:51 +0000 (18:45 +0530)
committerKurund Jalmi <kurund@civicrm.org>
Wed, 30 Sep 2015 13:15:51 +0000 (18:45 +0530)
4.6.9 merge-forward


Trivial merge