[presence/f17: 6/6] Merge branch 'master' into f17

[Fabian Deutsch]

commit 765c2673cd87f9515f63a2e248af4067e57d1de5
Merge: 41dff25 48c9f66
Author: Fabian Deutsch <fabiand at fedoraproject.org>
Date:   Mon Sep 3 22:21:09 2012 +0200

    Merge branch 'master' into f17

 .gitignore    |    1 +
 presence.spec |   13 +++++++++++--
 sources       |    2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)
---