Merge branch 'master' of https://git.gitorious.org/banshee-community-extensions/bansh...
authorNicholas Little <arealityfarbetween@googlemail.com>
Sun, 22 Jun 2014 19:17:07 +0000 (20:17 +0100)
committerNicholas Little <arealityfarbetween@googlemail.com>
Sun, 22 Jun 2014 19:17:07 +0000 (20:17 +0100)
commit904ed07571ca58d286d5ab24eb35f643504e1777
tree705508cce7ef32f6dd8db67d2d3095dc9b4c8bc6
parent31dba44dec604775fdbbbbfb023c8dd91c15cb7a
parentcf9bae3620a63d108c51bb9ef9b98f861e79a221
Merge branch 'master' of https://git.gitorious.org/banshee-community-extensions/banshee-community-extensions

Conflicts:
Extensions.sln
Extensions.sln
configure.ac
src/Makefile.am