Merge branch 'averni-master'
authormh <mh@immerda.ch>
Fri, 13 Jun 2014 09:23:47 +0000 (11:23 +0200)
committermh <mh@immerda.ch>
Fri, 13 Jun 2014 09:23:47 +0000 (11:23 +0200)
commitea1cf47e6a86d5641fc6655bff553c4dbe55b897
tree74756634572631c2909b7ad35c6d8413668d7ed2
parent0bbf3ce96c049cdcbc59dfdcef860f09d515f618
parente9b58ecddca10758f38602768a9ed20c88eaa35f
Merge branch 'averni-master'