[libreoffice/f20: 2/2] Merge remote-tracking branch 'origin/master' into f20

[David Tardon]

commit f4d74950fc554f2d7457f840ba6730c392b127ac
Merge: 3522fe5 364b9e3
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Apr 5 15:09:53 2014 +0200

    Merge remote-tracking branch 'origin/master' into f20

 0001-drop-OnlyShowIn-from-.desktop-files.patch |  114 ++++++++++++++++++++++++
 libreoffice.spec                               |    1 +
 2 files changed, 115 insertions(+), 0 deletions(-)
---