[bluefish: 2/2] Merge branch 'f20' back into master

[Paul Howarth]

commit 4bdb8048eb732efafa87c9c32ae8f127d98de620
Merge: bf0f86c e1c5f53
Author: Paul Howarth <paul at city-fan.org>
Date:   Wed Sep 4 14:47:50 2013 +0100

    Merge branch 'f20' back into master
    
    provenpackager failed to do a fast-forward merge from master,
    for reasons unknown.

---