[gnome-music/wip/merge: 37/343] Merge pull request #6 from kyoushuu/master

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 9bf0a2927cc28ea19e2863cac2b39c201903dd6c
Merge: 1771d5e b581db2
Author: Vadim Rutkovsky <roignac gmail com>
Date:   Sat Jul 13 07:24:45 2013 -0700

    Merge pull request #6 from kyoushuu/master
    
    grilo: Port from JavaScript to Python

 gnome-music/grilo.py |   81 ++++++++++++++++++++++++++++++++++++++++++++++++++
 gnome-music/view.py  |    2 +-
 2 files changed, 82 insertions(+), 1 deletions(-)
---