Merge remote-tracking branch 'origin/master' into lapp-resilient3
authorMarco Mariani <marco.mariani@nexedi.com>
Tue, 22 Jan 2013 14:42:22 +0000 (15:42 +0100)
committerMarco Mariani <marco.mariani@nexedi.com>
Tue, 22 Jan 2013 14:42:22 +0000 (15:42 +0100)
commit872371ded4cbd4e72758dae02fb9ef873f34e1a7
tree9568801e42f8faa55d7ff0982f07c67f2d99ef3f
parent4c994a38dd67942ff785fd1c14f10efc5817e3b4
parent029c69e902b62b4a9232df5abcc7daf430515733
Merge remote-tracking branch 'origin/master' into lapp-resilient3