Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-09-15-18-00-52
authorkurund <kurund@civicrm.org>
Mon, 15 Sep 2014 12:31:00 +0000 (18:01 +0530)
committerkurund <kurund@civicrm.org>
Mon, 15 Sep 2014 12:31:00 +0000 (18:01 +0530)

Trivial merge