Merge branch 'calc-in-parse-amount'
authorMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 17 May 2011 10:34:41 +0000 (12:34 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 17 May 2011 10:34:41 +0000 (12:34 +0200)
commita1b919cf654b7650efd3996272b0cfa7539ba04f
treefff793e805f596054f126b5cce3ad9cefc49adc4
parentcdaddc5ab3c569585e39ee9e3f11260ae2336fea
parentae3d4c2c0f541b17a02decb9872220b8121cf16d
Merge branch 'calc-in-parse-amount'