[ejabberd/f13/master: 2/2] Merge branch 'master' into f13/master

[Peter Lemenkov]

commit b5a5a8e1478c0225803dcf52cc8fc01919c1d83d
Merge: 20c86b3 0d57c98
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Wed Aug 18 15:14:28 2010 +0400

    Merge branch 'master' into f13/master

 ejabberd.logrotate |    2 +-
 ejabberd.spec      |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---