Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-03-23-18-45-28
authorkurund <kurund@civicrm.org>
Mon, 23 Mar 2015 13:15:33 +0000 (18:45 +0530)
committerkurund <kurund@civicrm.org>
Mon, 23 Mar 2015 13:15:33 +0000 (18:45 +0530)

Trivial merge