Merge branch 'master' of gitorious.org:fg/fgdata
authorBARANGER Emmanuel <embaranger@free.fr>
Fri, 20 Dec 2013 20:32:03 +0000 (21:32 +0100)
committerBARANGER Emmanuel <embaranger@free.fr>
Fri, 20 Dec 2013 20:32:03 +0000 (21:32 +0100)
commitb2746b9d82742c9331ad514be8f8d7e2c4d8451b
tree28eba87e0ee6c870e76e26220aeedab8a600f17e
parent1f7b78a4a7c456465b3f834d78704e78cd57ddda
parent6b2bc68377a068e4e56ab5b6eec8dbd5f801b893
Merge branch 'master' of gitorious.org:fg/fgdata