Merge branch 'hotfix' - ttest - Test Repo
       
 (HTM) git clone git://r-36.net/test
 (DIR) Log
 (DIR) Files
 (DIR) Refs
       ---
 (DIR) commit 0d8f16b4a382c449c0d4aebd1054f50daff70156
 (DIR) parent 9896c06735c3854e523df3c6df31343c8ef67bc5
 (HTM) Author: Christoph Lohmann <20h@r-36.net>
       Date:   Tue,  1 Feb 2011 09:50:40 +0100
       
       Merge branch 'hotfix'
       
       Conflicts:
               TEST
       
       Diffstat:
         TEST                                |       4 ++--
         TEST2                               |       2 ++
       
       2 files changed, 4 insertions(+), 2 deletions(-)
       ---
 (DIR) diff --git a/TEST b/TEST
       @@ -5,6 +5,6 @@ wndowqndowq
        
        wdnowqndwqond
        
       -A new branch begins here.
       -
       +Something awful will happen
        
       +here.
 (DIR) diff --git a/TEST2 b/TEST2
       @@ -0,0 +1,2 @@
       +Hello World
       +