Merge branch 'maint' into branch-1.11
authorPeter Rosin <peda@lysator.liu.se>
Wed, 7 Mar 2012 20:08:07 +0000 (21:08 +0100)
committerPeter Rosin <peda@lysator.liu.se>
Wed, 7 Mar 2012 20:08:07 +0000 (21:08 +0100)
commiteef596b31b635e2a198cecbadc488117de98c4de
tree5c706336c25f498c807a641d2a1efbdbeac7e858
parent8301f62d0a1379d783260df6acb6ecc1e0cb98df
parent3a8146089834c5187d0b0795b9fa71a0f9bba132
Merge branch 'maint' into branch-1.11