[MERGE] OPW 573701: pad: use openetherpad.org as default pad provided (ietherpad...
authorXavier ALT <xal@openerp.com>
Fri, 20 Jul 2012 13:24:05 +0000 (15:24 +0200)
committerXavier ALT <xal@openerp.com>
Fri, 20 Jul 2012 13:24:05 +0000 (15:24 +0200)
bzr revid: xal@openerp.com-20120720132405-6uonrmsr9hgq3f6m


Trivial merge