Software /
code /
prosody
Diff
util/import.lua @ 6054:7a5ddbaf758d
Merge 0.9->0.10
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Wed, 02 Apr 2014 17:41:38 +0100 |
parent | 5776:bd0ff8ae98a8 |
child | 7183:b606a5b32e91 |
line wrap: on
line diff
--- a/util/import.lua Wed Apr 02 14:31:19 2014 +0100 +++ b/util/import.lua Wed Apr 02 17:41:38 2014 +0100 @@ -1,7 +1,7 @@ -- Prosody IM -- Copyright (C) 2008-2010 Matthew Wild -- Copyright (C) 2008-2010 Waqas Hussain --- +-- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. --