Merge branch 'master' of git://git.onelab.eu/sfa into upmc
authorJordan Augé <jordan.auge@lip6.fr>
Tue, 27 Nov 2012 10:52:16 +0000 (11:52 +0100)
committerJordan Augé <jordan.auge@lip6.fr>
Tue, 27 Nov 2012 10:52:16 +0000 (11:52 +0100)

Trivial merge