Merge branch 'master' of gitorious.org:fg/fgdata
authorBARANGER Emmanuel <embaranger@free.fr>
Sun, 16 Jun 2013 16:57:38 +0000 (18:57 +0200)
committerBARANGER Emmanuel <embaranger@free.fr>
Sun, 16 Jun 2013 16:57:38 +0000 (18:57 +0200)
commite93d8bd52b2911904d4acc9781c0794c1edca580
tree094f96ff6f14a4e3ca8f70261e0f90f52cfd7178
parent3dd920c9ad796129dd3fb90ee108aa252cf6fa15
parentd7d041772823a303e95d9c80bb60b6ac41af9cc8
Merge branch 'master' of gitorious.org:fg/fgdata