Merge branch 'master' of gitorious.org:fg/fgdata
authorBARANGER Emmanuel <embaranger@free.fr>
Fri, 13 Dec 2013 22:17:45 +0000 (23:17 +0100)
committerBARANGER Emmanuel <embaranger@free.fr>
Fri, 13 Dec 2013 22:17:45 +0000 (23:17 +0100)
commit0d80e92066e033b3be86bdc9f508a7f341aa0ddb
treea58a474cb4ab4daec65533e5605b4333b23a5e62
parentba94f18e9b2c6216690cfd83686553bcc27628c0
parent51dbae4847d1f9f2727f0bb769d28ea4ad933ffd
Merge branch 'master' of gitorious.org:fg/fgdata