Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 12 Jun 2016 18:06:30 +0000 (20:06 +0200)
committerKim Alvefur <zash@zash.se>
Sun, 12 Jun 2016 18:06:30 +0000 (20:06 +0200)
commit455af00e41f1766abea5475e1be44f17a57e0879
treecd95da79a463a3ab9a603aeb1b12fa2cf2949c57
parentdc22aa98c54b035664e79e96f27ddda07209e7ee
parentfeb99f621e76b06014ca7be9508834ffb911dfa4
Merge 0.10->trunk
prosodyctl