Merge branch 'master' of gitorious.org:fg/fgdata into work
authorVivian Meazza <vivian.meazza@lineone.net>
Sun, 25 Sep 2011 10:01:30 +0000 (11:01 +0100)
committerVivian Meazza <vivian.meazza@lineone.net>
Sun, 25 Sep 2011 10:01:30 +0000 (11:01 +0100)
commit849f5007a67b925854394b44baf1875992449422
tree6a7952a404cb0aed75f54cf1dbdc60780acd0960
parentc499093fd3f951c1c68eae4555ea9c9908443749
parent138fd5eb4f94a86f3e0633fdf74ef02e65214d66
Merge branch 'master' of gitorious.org:fg/fgdata into work