Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-09-08-20-53-53
authorkurund <kurund@civicrm.org>
Mon, 8 Sep 2014 15:24:00 +0000 (20:54 +0530)
committerkurund <kurund@civicrm.org>
Mon, 8 Sep 2014 15:24:00 +0000 (20:54 +0530)

Trivial merge