Merge branch 'master' of gitorious.org:bluedevil/bluedevil v1.0-rc3
authorAlex Fiestas <alex@ufocoders.com>
Wed, 18 Aug 2010 20:40:27 +0000 (22:40 +0200)
committerAlex Fiestas <alex@ufocoders.com>
Wed, 18 Aug 2010 20:40:27 +0000 (22:40 +0200)
commit624313ad74de06bfefcccb74ffec55dbf5d51acf
tree756442b9f71419c2003c57df5d31bf008c3f0eff
parent1892b0201780936120a6a4a9a09abba285d1d25e
parentfedbdcd98eaceb08f70692067d96f0ebfbb3d2c2
Merge branch 'master' of gitorious.org:bluedevil/bluedevil

Conflicts:
src/actionplugins/sendfile/helper/sendfilesjob.cpp
src/actionplugins/sendfile/helper/sendfilesjob.cpp