[bitlbee] (2 commits) ...Merge commit 'bdd602bcdf7d58a75436e26ed62366f92e1d22d6'

[Adam Williamson]

Summary of changes:

  bdd602b... new release 3.0.4, drop a merged patch, rediff syslibdirs.p (*)
  9e0d600... Merge commit 'bdd602bcdf7d58a75436e26ed62366f92e1d22d6'

(*) This commit already existed in another branch; no separate mail sent