Merge branch 'yd/fix-parallel-build' into maint
commit6f7ccbab230b3144199a6057aa06c75c002286a7
authorYann Dirson <ydirson@free.fr>
Sat, 24 May 2014 12:38:17 +0000 (24 14:38 +0200)
committerYann Dirson <ydirson@free.fr>
Sat, 24 May 2014 12:38:17 +0000 (24 14:38 +0200)
tree57ac041a8a6e03e45e88fc784ad5567978d1592b
parent3abc03f7170b55bfcf97c4009abb570f62e48a24
parent71f3606bff110dda3eca39e82ed4059dc25534dd
Merge branch 'yd/fix-parallel-build' into maint