[mate-media: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/mate-media

[Dan Mashal]

commit 11ac21e7d91376ebfaa0c87d42838f19e086a0fe
Merge: 2d1c175 d9e932a
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Tue Mar 26 01:14:22 2013 -0700

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/mate-media
    
    Conflicts:
    	mate-media.spec

 mate-media.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc mate-media.spec
index c738a71,977f243..c253028
--- a/mate-media.spec
+++ b/mate-media.spec
@@@ -93,12 -107,11 +93,15 @@@ f
  %{_datadir}/mate-panel/applets/org.mate.applets.MixerApplet.mate-panel-applet
  %{_datadir}/mate/help/mate-mixer_applet2
  %{_datadir}/omf/mate-mixer_applet2
 +%{_datadir}/MateConf/gsettings/mate-volume-control.convert
  
  %changelog
 +* Tue Mar 26 2013 Dan Mashal <dan.mashal at fedoraproject.org> 1.5.2-1
 +- Update to latest upstream release
 +
+ * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
  * Sat Dec 22 2012 Nelson Marques <nmo.marques at gmail.com> - 1.5.1-3
  - mate-settings-daemon was build with gstreamer, we want to make
    sure we also have proper gstreamer support here. Only from MATE