Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-06-14-41-49
authorkurund <kurund@civicrm.org>
Mon, 6 Jul 2015 09:12:10 +0000 (14:42 +0530)
committerkurund <kurund@civicrm.org>
Mon, 6 Jul 2015 09:12:10 +0000 (14:42 +0530)

Trivial merge