[bzr-explorer/f15: 2/2] Merge branches 'master' and 'f15' into f15

[Julian Aloofi]

commit bedc83bdb5529e3656fd59d80d6ed3ccc8505e28
Merge: a947f66 47534d0
Author: Julian Aloofi <julian.fedora at googlemail.com>
Date:   Mon Aug 1 18:28:53 2011 +0200

    Merge branches 'master' and 'f15' into f15

 .gitignore        |    1 +
 bzr-explorer.spec |   15 +++++++++------
 sources           |    2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)
---