Merge pull request #1389 from kurund/merge-fixes
authorKurund Jalmi <kurund@civicrm.org>
Sun, 11 Aug 2013 18:34:34 +0000 (11:34 -0700)
committerKurund Jalmi <kurund@civicrm.org>
Sun, 11 Aug 2013 18:34:34 +0000 (11:34 -0700)
test fixes


Trivial merge