Merge branch 'sgen-windows'
authorMark Probst <mark.probst@gmail.com>
Sun, 9 Oct 2011 13:01:12 +0000 (15:01 +0200)
committerMark Probst <mark.probst@gmail.com>
Sun, 9 Oct 2011 13:01:12 +0000 (15:01 +0200)
commit05c7cd052d0a1c3676414a119c1fa946daa5fc2d
treee107b141582f6dfa302b24cd59d4e9cd409131ce
parent1d55eeb3f206cbd4f83712b53d443f8cc3a83dec
parent83ab9f001dea92cdab11a315897cd2befd05cd0a
Merge branch 'sgen-windows'