Merge pull request #959 from lynnaloo/billing
authorLinda Nichols <lynnaloo@gmail.com>
Tue, 22 Oct 2013 03:22:26 +0000 (20:22 -0700)
committerLinda Nichols <lynnaloo@gmail.com>
Tue, 22 Oct 2013 03:22:26 +0000 (20:22 -0700)
Merge master into billing without conflicts


Trivial merge