Merge branch 'master' of git://git.onelab.eu/sfa into upmc
authorJordan Augé <jordan.auge@lip6.fr>
Fri, 11 Jan 2013 10:38:51 +0000 (11:38 +0100)
committerJordan Augé <jordan.auge@lip6.fr>
Fri, 11 Jan 2013 10:38:51 +0000 (11:38 +0100)

Trivial merge