eb646b9e44a7886124cd11782f74fd9937b85af4 Sebastien Grosjean public@zencocoon.com http://github.com/ZenCocoon/inplacericheditor/commit/10f874c67d69eb384990968eb9cad3b7c462aafc 10f874c67d69eb384990968eb9cad3b7c462aafc 2009-03-28T00:27:46-07:00 2009-03-28T00:27:46-07:00 Merge branches 'master' and '1-3-1-stable' 9a2d2e142c2acc34cf5521d9f0210ef0aaa9d689 Sebastien Grosjean public@zencocoon.com