diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-03-22 17:26:12 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-03-22 17:26:12 +0000 |
| commit | e9210ce2e777ed966cc4e80df96582e84d0d2ae8 (patch) | |
| tree | 9a36c6329eb70d4e655dc88742cea8419f06f9c3 /prosody | |
| parent | 2c597f0fa443131956fd7e9d3ad86774f1dd7c7b (diff) | |
| parent | 46c0b8c7f9adeeef3e0a22204879d82230ce3d5b (diff) | |
| download | prosody-e9210ce2e777ed966cc4e80df96582e84d0d2ae8.tar.gz prosody-e9210ce2e777ed966cc4e80df96582e84d0d2ae8.zip | |
Merge 0.7->trunk
Diffstat (limited to 'prosody')
| -rwxr-xr-x | prosody | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,7 +1,7 @@ #!/usr/bin/env lua -- Prosody IM --- Copyright (C) 2008-2009 Matthew Wild --- Copyright (C) 2008-2009 Waqas Hussain +-- 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. |