Merge branch 'oracle-fixes'
authorDagfinn Ilmari Mannsåker <ilmari@ilmari.org>
Sat, 18 Oct 2014 14:49:54 +0000 (15:49 +0100)
committerDagfinn Ilmari Mannsåker <ilmari@ilmari.org>
Sat, 18 Oct 2014 14:49:54 +0000 (15:49 +0100)
commit485191b0e6ce602bb2fa2b598689b3b5cfea3eef
tree00ccfc58004e78743d32a28976bd5b4ed101417c
parent553b1eed21906279c4795982057c149a7491af9c
parent4c9c21e68ca1b9229ed021b3f3816a9a63a8a866
Merge branch 'oracle-fixes'