Merge remote branch 'upstream/master'
[novacoin.git] / src / xpm /
2011-04-23 Jaromildirectory re-organization (keeps the old build system)