Merge branch 'master' of gitorious.org:fg/fgdata into work
authorVivian Meazza <vivian.meazza@lineone.net>
Tue, 28 Aug 2012 07:54:43 +0000 (08:54 +0100)
committerVivian Meazza <vivian.meazza@lineone.net>
Tue, 28 Aug 2012 07:54:43 +0000 (08:54 +0100)
commit6005cbd6807803f39b59c7994a35a4e6f68c702e
tree0dba8d22f2f900001e3e70d6ba85c3c0a4458c97
parent514c27d282e9f55982a5b702f2ecdb5781c45589
parentc5d32003ed34cfffc175a5e828ca96ad781a2912
Merge branch 'master' of gitorious.org:fg/fgdata into work