Merge branch 'master' into experimental
authorMladen Horvat <acid-burn@opendreambox.org>
Fri, 10 Jun 2011 07:40:44 +0000 (09:40 +0200)
committerMladen Horvat <acid-burn@opendreambox.org>
Fri, 10 Jun 2011 07:40:44 +0000 (09:40 +0200)
commit052ac8e2221b9df53735eab1d8f627ef031c04b5
treed484f4f60a48f91f28d4218dee56b06f411b3a13
parent04326198394bd5dee1d02d8929689fb9b4203442
parent1363444a823d40458eef9c71f1fe423650fe8c34
Merge branch 'master' into experimental

Conflicts:
lastfm/CONTROL/control
lastfm/meta/plugin_lastfm.xml
lastfm/src/plugin.py
lastfm/CONTROL/control
lastfm/meta/plugin_lastfm.xml
lastfm/src/plugin.py