Merge branch 'statgraph-mailmap'
commit3b0532d9646bedf444acdf865fc51018ec4344cd
authorSven Strickroth <email@cs-ware.de>
Mon, 11 Mar 2013 17:32:27 +0000 (11 18:32 +0100)
committerSven Strickroth <email@cs-ware.de>
Mon, 11 Mar 2013 17:32:27 +0000 (11 18:32 +0100)
treea1128f32526a30d7cfe094207b2b85f351928ed2
parentc5ffc40e6d599ff037697d29bae21f00767113a3
parent101c237a60fc0bf713b4d58cb3df4f6f7fc48a25
Merge branch 'statgraph-mailmap'

Signed-off-by: Sven Strickroth <email@cs-ware.de>