]> granicus.if.org Git - ejabberd/commit
Merge remote-tracking branch 'processone/pr/907'
authorHolger Weiss <holger@zedat.fu-berlin.de>
Sat, 16 Jan 2016 23:08:30 +0000 (00:08 +0100)
committerHolger Weiss <holger@zedat.fu-berlin.de>
Sat, 16 Jan 2016 23:08:30 +0000 (00:08 +0100)
commit0125870f92ca27bed535f049c090220f245903f4
treef21db441e47c1b24fa1efd925705e03b6335ef1b
parent63777f830d912bb129e32242a23b74d917b6f080
parentb244bce49c0de9dbfa0f68befc57366c2011b652
Merge remote-tracking branch 'processone/pr/907'

* processone/pr/907:
  don't escape ERL_OPTIONS
ejabberdctl.template