Merge branch 'master' of git.grml.org:grml-infrastructure
authorChristian Hofstaedtler <ch@grml.org>
Sun, 29 May 2011 12:30:09 +0000 (14:30 +0200)
committerChristian Hofstaedtler <ch@grml.org>
Sun, 29 May 2011 12:30:09 +0000 (14:30 +0200)
commit03712fb078bb2b454bcbd09c27e83881238f8bc0
tree728cafb9b2d37a96c2dd968a5ed845370cdbb0df
parent4225834d4ff78227fe4ecffd9c312759b44c760e
parentb0fb072948992be111d4cfebaa2cb9ca346a77ad
Merge branch 'master' of git.grml.org:grml-infrastructure