[gnome-music: 11/11] Merge remote-tracking branch 'github/master'

[Vadim Rutkovsky <vrutkovsky src gnome org>]

commit eba1d909c85ce41220bde9e779fef34b307a2ce9
Merge: cb46c8f 97c617d
Author: Vadim Rutkovsky <vrutkovs redhat com>
Date:   Fri Jul 26 16:09:21 2013 +0200

    Merge remote-tracking branch 'github/master'

 data/AlbumWidget.ui         |    4 +-
 data/PlayerToolbar.ui       |    6 ++--
 gnomemusic/albumArtCache.py |   18 ++++------
 gnomemusic/player.py        |    2 +-
 gnomemusic/view.py          |   77 ++++++++++++++++++++++---------------------
 gnomemusic/widgets.py       |   53 +++++++++++++++--------------
 gnomemusic/window.py        |    4 +-
 7 files changed, 81 insertions(+), 83 deletions(-)
---