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)
commit10d09491b938188f96d5c62a75b496338e81139b
treeb34e2adaaaed563242917a4581bcc6476d1784ed
parentdca4ca9da6f6a11b4458a515e624be4ac3e1ee03
parenta8e659741916210d929a80bd1f7f7b3b686da6e9
Merge branch 'giant-rabbit-angular-tests'