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)
commit239b29456a9245d5494536678bee59678bac03a3
treed9a1c5822d27f2610c6f88454b6174bcb27092f9
parentc770a972f7d0242c62e12981b14f5af207b92c9b
parent4167f91a0e461478132a6efc81579f7c4858e386
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-09-15-18-00-52