Merge branch 'giant-rabbit-angular-tests'
authorTim Otten <totten@civicrm.org>
Sat, 3 Jan 2015 17:53:03 +0000 (09:53 -0800)
committerTim Otten <totten@civicrm.org>
Sat, 3 Jan 2015 17:53:03 +0000 (09:53 -0800)

Trivial merge