[bitlbee/f15] (5 commits) ...Merge commit '85e36aa45d060e465016645027c2f87852480985' into f15

[Adam Williamson]

Summary of changes:

  d653e14... fix MSN login (upstream commit 823) (*)
  85e36aa... correct patch application (*)
  5642bf0... fix MSN login (upstream commit 823)
  73c6efd... correct patch application
  cbc26d3... Merge commit '85e36aa45d060e465016645027c2f87852480985' int

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