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

[Paul Whalen]

commit c0dedf55369b1df467fab663cb9611600f571181
Merge: d506054 b8d72d6
Author: Paul Whalen <paul.whalen at senecac.on.ca>
Date:   Wed Jun 1 11:43:59 2011 -0400

    Merge branch 'master' into f14

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