Merge branch 'master' into epoxy
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Sun, 9 Mar 2014 11:30:27 +0000 (12:30 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Sun, 9 Mar 2014 11:30:27 +0000 (12:30 +0100)
commit12c11c0e615f7fc17ef7a600ff0c9099f7908dbc
treecbd7c8b108674d1e4732d837280145c681d11d9b
parentf51595f6c9e2eb280a4f1fcb63a9aa8fafcf3660
parent6cb5e1fe7bc64c156da45b7646e2e52bf473e253
Merge branch 'master' into epoxy
init.cpp