Merge branch 'get_default_discount'
authorMaxime Bourget <bmx007@gmail.com>
Sun, 26 May 2013 17:52:22 +0000 (18:52 +0100)
committerMaxime Bourget <bmx007@gmail.com>
Sun, 26 May 2013 17:52:22 +0000 (18:52 +0100)

Trivial merge