aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-04-09 15:51:08 +0200
committerKim Alvefur <zash@zash.se>2013-04-09 15:51:08 +0200
commit890bf7ab7466264a1d334bc0aa8a84c22a4ebf56 (patch)
tree1bd41093a6d55f3960165ad5b10225a2d9e38a6c /Makefile
parentf9046080ba1340ea049bc4830a41a2e0d84d2530 (diff)
parentd5457e36492d72a959b12b466ba92b21374e7417 (diff)
downloadprosody-890bf7ab7466264a1d334bc0aa8a84c22a4ebf56.tar.gz
prosody-890bf7ab7466264a1d334bc0aa8a84c22a4ebf56.zip
Merge 0.9->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions