2 Commits (c09135d251532f834e3a0a6103f45f8e62b0e518)

Author	SHA1	Message	Date
Richard van den Berg	3a4c540a81	Updated description to reflect merging use case	2017-01-11 10:08:35 +01:00
Richard van den Berg	50bae1f549	Simple import module to import MISP JSON format	2017-01-11 10:08:35 +01:00