diff options
author | Michael Lauer <mickey@vanille-media.de> | 2008-03-21 23:26:41 +0000 |
---|---|---|
committer | Michael Lauer <mickey@vanille-media.de> | 2008-03-21 23:26:41 +0000 |
commit | 507f5c47f31dc102d925959788af4ae8ddb5f6c9 (patch) | |
tree | 4ba3ccb6fcc4ab1dba6d51d35cffe4097298961b /conf/licenses.conf | |
parent | dc9e3345fd087227731b17379aa46e1b8ee2d9b6 (diff) | |
parent | e737833493b9017bbfd3ab0dba6a2d26f85eebd8 (diff) |
merge of '17fe5a20eddea57fb860ffa0652cc78cda424804'
and '281a5681239793312291488e7b216ecbdfce9b33'
Diffstat (limited to 'conf/licenses.conf')
0 files changed, 0 insertions, 0 deletions