aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-06-02 19:27:45 +0200
committerKim Alvefur <zash@zash.se>2013-06-02 19:27:45 +0200
commit906209db71d1948bbda63406061e7969ee07d6fc (patch)
tree8682d1e5655d123e3db62a1c4313216d976053bd /Makefile
parent8d85647c37f3b1fd49e0d639d5646745672391bd (diff)
parent280227fdb28ce774b5e838f5db18da985710ebd8 (diff)
downloadprosody-906209db71d1948bbda63406061e7969ee07d6fc.tar.gz
prosody-906209db71d1948bbda63406061e7969ee07d6fc.zip
Merge 0.9->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions