Merge branch 'master' of vcs.fsf.org:enc
authortomnor <tomasn@kth.se>
Mon, 8 Feb 2016 21:59:42 +0000 (22:59 +0100)
committertomnor <tomasn@kth.se>
Mon, 8 Feb 2016 21:59:42 +0000 (22:59 +0100)
commitf3beb6bf16f7667633a947828e8c8bd6ae1152db
tree378babf6e0d20231bc5d6fc283e7771a2b9724ff
parent0317c610a100e6b012e415c0d3088cc32a60089b
parent44126396c151679eda658af35503d9ebd8e23487
Merge branch 'master' of vcs.fsf.org:enc