[purple-microblog/f12/master] (6 commits) ...Merge branch 'master' into f12

[Matej Cepl]

Summary of changes:

  be0ff79... clean up the spec (*)
  b28fee3... - removing useless electric-fence BR (*)
  ff8d9cc... Fix typo that causes a failure to update the common directo (*)
  e36bf7b... dist-git conversion (*)
  321e130... New upstream release. (*)
  89596ce... Merge branch 'master' into f12

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