Merge branch 'master' of aristoteles.sthu.org:~/gitweb/shutils
authorStefan Huber <shuber2@gmx.at>
Thu, 15 Nov 2012 10:10:52 +0000 (11:10 +0100)
committerStefan Huber <shuber2@gmx.at>
Thu, 15 Nov 2012 10:10:52 +0000 (11:10 +0100)
commit02bd76232d9bb0daca5aee825fdb0bf137ac0afc
treef1c429e1c761fa2f60a0dcaa656cd6af0d45778f
parentb75b12318a27357fba15b2e3d54e260f1a1f7f0c
parent0fdcd43f716bd3c0c29c189df1a54c88d0ac015c
Merge branch 'master' of aristoteles.sthu.org:~/gitweb/shutils