Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-03-16-17-26-57
authorkurund <kurund@civicrm.org>
Mon, 16 Mar 2015 11:57:14 +0000 (17:27 +0530)
committerkurund <kurund@civicrm.org>
Mon, 16 Mar 2015 11:57:14 +0000 (17:27 +0530)

Trivial merge