Merge pull request #3381 from eileenmcnaughton/CRM-14197
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 28 May 2014 08:01:16 +0000 (20:01 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Wed, 28 May 2014 08:01:16 +0000 (20:01 +1200)
commit128f74864fd307f3e6dd8a6da1eefa3639c57190
treebf3dd3c60b9d792b8a1cb27ea5122b0a79210435
parentd1dace0f1527984de180503fe8a9180670b94e16
parentd81c67a2285b51d5df6ce80a8fadaded3c87d7f6
Merge pull request #3381 from eileenmcnaughton/CRM-14197

CRM-14197 remove rebase introduced error