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)
commitd98932353500e847ec7b336576b088550ce71aa7
tree0c786560eba5169d097af32e8359a4f1bfd11e85
parentf178507323dd77ce728f572014621ba1488a06b8
parentc5e23a3f72b184822b7581e157f88a4b36c2fbc0
Merge branch 'master' of bb:elax/fa-order_line_extra