Merge branch 'maint'
authorPeter Rosin <peda@lysator.liu.se>
Wed, 7 Mar 2012 20:08:08 +0000 (21:08 +0100)
committerPeter Rosin <peda@lysator.liu.se>
Wed, 7 Mar 2012 20:08:08 +0000 (21:08 +0100)
commita1fb35adb26eb8ffa57927829dfeeb963a970ff9
tree47430ac02715ddd785622a637167a26e99fc3333
parent2141a6b191705f7d4e972e78c341977896fe6fc2
parent3a8146089834c5187d0b0795b9fa71a0f9bba132
Merge branch 'maint'