Merge branch 'master' of gitorious.org:fg/fgdata into work
authorVivian Meazza <vivian.meazza@lineone.net>
Thu, 29 Sep 2011 20:36:13 +0000 (21:36 +0100)
committerVivian Meazza <vivian.meazza@lineone.net>
Thu, 29 Sep 2011 20:36:13 +0000 (21:36 +0100)
commit45676b0904e43b177682ca1eeb061b86cf114a78
treef4315bed18f59210ed017abae2ac892218e82192
parentad8acbcc81e3306d92e007b034ec3e8169fcce29
parentfc6ecd2df8a0fb7928e8fcd4cb8b09d31638e38a
Merge branch 'master' of gitorious.org:fg/fgdata into work