Merge 0.9->0.10
authorMatthew Wild <mwild1@gmail.com>
Thu, 31 Jul 2014 06:11:54 +0000 (07:11 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 31 Jul 2014 06:11:54 +0000 (07:11 +0100)
commit27a7e8a338b122b1d18921cc83abc4204c2eb42a
treeb3f95ab97db298b1497d23b17adca329d8df2121
parentc5988d02590871377a63cb7d96c178599929afcb
parent727dfdf59ae49df9a4f3485643e9d7cbdd14a5ed
Merge 0.9->0.10
core/configmanager.lua
prosodyctl