Merge remote-tracking branch 'origin/master' into rewrite-filter
authorJakub Skoczen <jakub@indexdata.dk>
Tue, 7 May 2013 15:25:00 +0000 (17:25 +0200)
committerJakub Skoczen <jakub@indexdata.dk>
Tue, 7 May 2013 15:25:00 +0000 (17:25 +0200)

Trivial merge