xsplash

Merge proposals dependent on lp://staging/~bratsche/xsplash/timeout-option-fix

  1. timeout-option-fix
  2. Dependent merge proposals

lp://staging/~bratsche/xsplash/timeout-option-fix has no merge proposals.