Merge branch 'master' of bb:elax/fa-order_line_extra
authorMaxime Bourget <bmx007@gmail.com>
Sun, 26 May 2013 22:42:06 +0000 (23:42 +0100)
committerMaxime Bourget <bmx007@gmail.com>
Sun, 26 May 2013 22:42:06 +0000 (23:42 +0100)

Trivial merge