aboutsummaryrefslogtreecommitdiffstats
path: root/EPLICENCE
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2012-02-07 11:39:42 +0100
committerMicael Karlberg <[email protected]>2012-02-07 11:39:42 +0100
commitc67df603f88f1cd41c35bfb1d663978864689fe9 (patch)
tree47f3881f85e16466a5ac0998e949636d986d6ce4 /EPLICENCE
parentb2eeb740c6e013055603aaaee1570550d380b720 (diff)
parent4d849824fccb58764f6733c4d30a74906dd92b00 (diff)
downloadotp-c67df603f88f1cd41c35bfb1d663978864689fe9.tar.gz
otp-c67df603f88f1cd41c35bfb1d663978864689fe9.tar.bz2
otp-c67df603f88f1cd41c35bfb1d663978864689fe9.zip
Merge branch 'bmk/inets/httpd/configurable_server_tokens/OTP-9805' into bmk/inets/inets59_integration
Conflicts: lib/inets/src/inets_app/inets.appup.src
Diffstat (limited to 'EPLICENCE')
0 files changed, 0 insertions, 0 deletions