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

[Peter Lemenkov]

commit efc419ecc77fdec3987d793b0f01e1ebed96d84f
Merge: 8422283 0d57c98
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Wed Aug 18 15:13:26 2010 +0400

    Merge branch 'master' into f14/master

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