Merge branch 'master' of gitorious.org:fg/fgdata
authorBARANGER Emmanuel <embaranger@free.fr>
Fri, 10 Jan 2014 13:47:37 +0000 (14:47 +0100)
committerBARANGER Emmanuel <embaranger@free.fr>
Fri, 10 Jan 2014 13:47:37 +0000 (14:47 +0100)
commitdcc550e4f1673cfda5a2fafb14fae876b1c1f842
tree7ba347e5749f9a3295039e804d3577b8f4999918
parentb85c5f830bed985837c7d3e4156f3689b90b2f53
parent2e9c976e0440fbc763528277ba105ea651ed4090
Merge branch 'master' of gitorious.org:fg/fgdata