[mirall/f18: 7/7] Merge branch 'master' into f18

[Joseph Marrero]

commit 7d77fdef3d60a6100bd2b970d10b0b5ef32529ff
Merge: 496f50f e70772d
Author: Joseph <joseph at localhost.localdomain>
Date:   Sun Jan 27 05:25:49 2013 +0000

    Merge branch 'master' into f18

 .gitignore                |    1 +
 mirall-1.2.0beta2.tar.bz2 |  Bin 648520 -> 0 bytes
 mirall.desktop            |    7 -------
 mirall.spec               |   22 ++++++----------------
 owncloud-client.desktop   |    7 -------
 sources                   |    2 +-
 6 files changed, 8 insertions(+), 31 deletions(-)
---