Merge branch 'master' of git://gitorious.org/shepherd/shepherd
authorLinus Wallgren <linus.wallgren@gmail.com>
Fri, 23 Jul 2010 21:41:00 +0000 (23:41 +0200)
committerLinus Wallgren <linus.wallgren@gmail.com>
Fri, 23 Jul 2010 21:41:00 +0000 (23:41 +0200)
commitcd703a4e8b44ef3a00020b614e69477b1b9d9622
tree41c6e602b2e796817bd037ebdeb18525973b1cab
parentcc9bdd9b2212fa185607785bc4d715469ca11299
parent5027d40974c0574ff54f3712def6583add7a6948
Merge branch 'master' of git://gitorious.org/shepherd/shepherd

Conflicts:
shepherd/shepherddaemon.cpp