Merge branch 'master' of ssh://kitenet.net/srv/git/kitenet.net/mr

diff --combined mr
index f769eff461ef8241a09679c18682540412a225f3,6ace1d82d2578f490731372d9807a268bcff21b6..530f2e0f6ad2206f766deda6f74440fe26069918
--- 1/mr
--- 2/mr
+++ b/mr
@@@ -263,13 -263,7 +263,13 @@@ print "\nmr $action: finished (".join("
        showstat($#failed+1, "failed", "failed"),
        showstat($#skipped+1, "skipped", "skipped"),
  ).")\n";
 -exit @failed ? 1 : 0;
 +if (@failed) {
 +      exit 1;
 +}
 +elsif (! @successful && @skipped) {
 +      exit 1;
 +}
 +exit 0;
  
  my %loaded;
  sub loadconfig {
@@@ -356,9 -350,9 +356,9 @@@
        }
  }
  
- __DATA__
- # Some useful actions that mr knows about by default.
+ # Finally, some useful actions that mr knows about by default.
  # These can be overridden in ~/.mrconfig.
+ __DATA__
  [default]
  update = \
        if [ -d .svn ]; then \