Merge branch 'maint'
authorCarsten Dominik <carsten.dominik@gmail.com>
Sun, 8 Sep 2013 16:23:03 +0000 (18:23 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Sun, 8 Sep 2013 16:23:03 +0000 (18:23 +0200)
commit3f27d102bd8829c4f97e01809610a879e93b48aa
tree89fc9527cfbe02ac55b99c9f366e8cc97a07d787
parent9a3d30626e66f03b750cffc27c691b7cd1199761
parente677589e69140f64a7e165b2ea0287df4d0a20c3
Merge branch 'maint'