diff LICENSE @ 7485:4fc2763e670e

Another merge fix.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Wed, 16 Jan 2013 15:39:59 +0100
parents cdef89d821bd
children
line wrap: on
line diff