Merge branch 'master' into 5735-edit-description-box-size
authorRadhika Chippada <radhika@curoverse.com>
Tue, 5 May 2015 18:16:38 +0000 (14:16 -0400)
committerRadhika Chippada <radhika@curoverse.com>
Tue, 5 May 2015 18:16:38 +0000 (14:16 -0400)
commit6e10831be039fb540fc252d35e0ffe673ea8d398
treeb10056f8b98e2b78a0fb1ea56bff6a9d2c5c32f7
parentfe7d9a6cd96c7fadf869482e3bc99b2c18980248
parent9d4bc458b767e4c05024dfe02207283745e1ba06
Merge branch 'master' into 5735-edit-description-box-size