Merge branch 'yd/hardcoded' into maint
commite7f4fd27ffc50adfb8950c06c3ea77f7c7961c1d
authorYann Dirson <ydirson@free.fr>
Mon, 14 Jul 2014 16:45:01 +0000 (14 18:45 +0200)
committerYann Dirson <ydirson@free.fr>
Mon, 14 Jul 2014 16:45:01 +0000 (14 18:45 +0200)
tree76d81508289c973e9aaf5a6549e0cb7203066720
parent38d1cb2d253e1f7b2927757931eac693dc74a950
parentd6d9e3c6993ed6d92a2f4b0b9a589b8e7927d33f
Merge branch 'yd/hardcoded' into maint