Merge branch 'master' of bb:elax/fa-order_line_extra
authorMaxime Bourget <bmx007@gmail.com>
Mon, 6 May 2013 19:36:17 +0000 (20:36 +0100)
committerMaxime Bourget <bmx007@gmail.com>
Mon, 6 May 2013 19:36:17 +0000 (20:36 +0100)

Trivial merge