Merge branch 'master' of gitorious.org:fg/fgdata into work
authorVivian Meazza <vivian.meazza@lineone.net>
Tue, 28 Aug 2012 21:46:42 +0000 (22:46 +0100)
committerVivian Meazza <vivian.meazza@lineone.net>
Tue, 28 Aug 2012 21:46:42 +0000 (22:46 +0100)
commit8cfc996a4495207d768427b7f3f19c5b99391081
treeb320f9e58489a3e420dde4292778423ab4f40c5a
parentaae3225296a55f314c97d4a30aec0de993be5fc9
parent7df1434500bdaa7b8ebc023ded8f41842d40c321
Merge branch 'master' of gitorious.org:fg/fgdata into work