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)
commit90a79db25696a46b069a1fe6ba789001f79b00eb
tree6e13c82a9fa9272e58089510329c8c8c1632c36f
parentd03c215ae25f4595d5730cd9996967f1898b2309
parent9dc9e5956ed5c6979f39b8f36e6c7ce8c3efe8ba
Merge branch 'master' of bb:elax/fa-order_line_extra