From f66b08b4dc5a473ad520df4cba585ca3b2d9931e Mon Sep 17 00:00:00 2001
From: BARANGER Emmanuel <embaranger@free.fr>
Date: Sun, 15 Jan 2012 01:42:54 +0100
Subject: [PATCH 1/2] Merge branch 'master' of git://gitorious.org/fg/fgdata


From 787a0dd6e1f516a1af24288f585c222e60e1d432 Mon Sep 17 00:00:00 2001
From: BARANGER Emmanuel <embaranger@free.fr>
Date: Sun, 15 Jan 2012 23:54:39 +0100
Subject: [PATCH 2/2] Merge branch 'master' of git://gitorious.org/fg/fgdata