Merge branch 'master' of git://gitorious.org/fg/fgdata
authorBARANGER Emmanuel <embaranger@free.fr>
Sun, 15 Jul 2012 20:48:30 +0000 (22:48 +0200)
committerBARANGER Emmanuel <embaranger@free.fr>
Sun, 15 Jul 2012 20:48:30 +0000 (22:48 +0200)
commit5d34cb90d7ec39f44aed95bcedf0a787888bcbe0
tree3b52253649bef9425e297b702a2decf74c456418
parent6292d1e8b6651b7603913910187ffc369a23da35
parentbe68262e8d513a9076049f2365770ec5f46865cc
Merge branch 'master' of git://gitorious.org/fg/fgdata