From e3c96d9d8555b70f1a80863a4d2b6d919d65419b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Fri, 1 Mar 2019 10:46:48 -0800
Subject: [PATCH] chg: Bump version

---
 .gitchangelog.rc   |   2 +-
 CHANGELOG.txt      | 813 ++++++---------------------------------------
 pymisp/__init__.py |   2 +-
 3 files changed, 95 insertions(+), 722 deletions(-)

diff --git a/.gitchangelog.rc b/.gitchangelog.rc
index ceec5e9..7a59d9a 100644
--- a/.gitchangelog.rc
+++ b/.gitchangelog.rc
@@ -188,5 +188,5 @@ output_engine = rest_py
 ##
 ## This option tells git-log whether to include merge commits in the log.
 ## The default is to include them.
-include_merge = True
+include_merge = False
 
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8ac8e25..0c26e42 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,6 +2,98 @@ Changelog
 =========
 
 
+v2.4.103 (2019-03-01)
+---------------------
+
+New
+~~~
+- [badge] Added pypi and python version badge. [Steve Clement]
+- Add auth parameter to pass to python-requests. [Raphaël Vinot]
+- Add readthedocs config. [Raphaël Vinot]
+
+Changes
+~~~~~~~
+- [jupyter] remove all the response key (as response is removing it)
+  [Alexandre Dulaunoy]
+- Enforce strict in object testing to ease debugging. [Raphaël Vinot]
+- Bump misp-objects. [Raphaël Vinot]
+- [pipenv] Pipfile.lock generated. [Alexandre Dulaunoy]
+- [exportpdf] BIG refactoring. Classes, comments, Galaxy starting.
+  [Falconieri]
+- [exportPDF] add basic handling of clusters. [Falconieri]
+- [exportpdf] Add metadata, bugfixes cases (too long values,
+  sanitization), links to misp instances. [Falconieri]
+- Add sphinx-autodoc-typehints. [Raphaël Vinot]
+- Use version 2 of readthedoc config file. [Raphaël Vinot]
+- [doc] add a reference to the Jupyter Notebook. [Alexandre Dulaunoy]
+- Remove dependency on six. [Raphaël Vinot]
+
+Fix
+~~~
+- [exportpdf] fix empty object/attribute/galaxy bugs. [Falconieri]
+- [exportpdf] Add suggestions (UX) [Falconieri]
+- [exportpdf] switch page size to A4. [Falconieri]
+- [exportpdf] switch page size to A4. [Falconieri]
+- Hopefully last fix for python 2.7 & reportlab. [Raphaël Vinot]
+- Python 2.7 blah foo. [Raphaël Vinot]
+- Bump tests relatively to the file template. [Raphaël Vinot]
+- Let's act as if python2 doesn't exists. [Raphaël Vinot]
+- Properly pass the auth parameter to the request. [Raphaël Vinot]
+- Properly catch error if reportlab isn't installed. [Raphaël Vinot]
+- Make sure install works even without reportlab installed. [Raphaël
+  Vinot]
+- [gitmodules] revert to official misp-objects. [Steve Clement]
+- URLJoin condition for double quotes. [Hannah Ward]
+- Do not override sub-path from root URL. [Hannah Ward]
+- [exportpdf] None if no Galaxies bug. [Falconieri]
+- [reportlab] Galaxies and Clusters printing. [Falconieri]
+- [reportlab] Clusters added. Still UX to perform. [Falconieri]
+- [reportlab] working clusters and galaxies. Not nice however.
+  [Falconieri]
+- [exportPDF] Adding facultative text description, sightings, tests
+  cases. [Falconieri]
+- [exportpdf] Add Object date. [Falconieri]
+- [exportpdf] Double property printing error fixed. [Falconieri]
+- [exportpdf] Refactoring, nicer code. [Falconieri]
+- [exportpdf] tests paths. [Falconieri]
+- [exportpdf] Remove comment that codefactor doesn't like. [Falconieri]
+- [pdfexport] Fix tests paths, dependency in pipfile, imports, and
+  'file' name overwrite in test function. [Falconieri]
+- Copy event dictionary when creating a MISPEvent. [Raphaël Vinot]
+
+  Fix #321
+- Wrong documentation on PyMISP.search_sightings. [Raphaël Vinot]
+
+  Fix #336
+- Disable all logging in the tests. [Raphaël Vinot]
+- Typo in sphinx config. [Raphaël Vinot]
+- Typo in documentation. [Raphaël Vinot]
+- Fix dependencies for py2. [Raphaël Vinot]
+- Disable STIX test on travis. [Raphaël Vinot]
+- Properly inform user when they try to run the live tests on old
+  systems. [Raphaël Vinot]
+
+  Fix #329
+
+Other
+~~~~~
+- - Set my misp-objects… [Steve Clement]
+- Add : [exportpdf] Objects handling, tests cases, test files.
+  [Falconieri]
+- Add: [exportpdf] Handling pictures embedded as attributes.
+  [Falconieri]
+- Add : [exportpdf] Picture management, manual. [Falconieri]
+- Fix & add: [exportpdf] Add metadata, fix special cases (too long
+  values, sanitization) [Falconieri]
+- Add: exportpdf tool working. [Falconieri]
+- General improvement : deisgn, exhaustiviness of mispEvent values
+  displayed, good pratice concerning paragraphe/table made. [Falconieri]
+- Update with table basics. [Falconieri]
+- Structure of the improvements OK : test file, test folder, report
+  generator. [Falconieri]
+- Search function fix to comply new version of MISP. [Armīns Palms]
+
+
 v2.4.102 (2019-02-03)
 ---------------------
 
@@ -11,6 +103,7 @@ New
 
 Changes
 ~~~~~~~
+- Bump Version & changelog. [Raphaël Vinot]
 - Bump misp-objects. [Raphaël Vinot]
 - [datamodel] new anonymised type added. [Alexandre Dulaunoy]
 - [data] types updated to include the new zeek type. [Alexandre
@@ -18,11 +111,7 @@ Changes
 
 Other
 ~~~~~
-- Merge pull request #328 from kirzaks/master. [Raphaël Vinot]
-
-  Check if IOC values are in warninglist
 - Check if IOC values are in warninglist. [Armīns Palms]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
 
 
 v2.4.101 (2019-01-28)
@@ -100,34 +189,12 @@ Fix
 
 Other
 ~~~~~
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #325 from winklerrr/patch-1. [Raphaël Vinot]
-
-  Update pymisp tutorial
 - Update pymisp tutorial. [Sandro Winkler]
 
   Extract the "response" field from the json result returned by misp.search_index
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #306 from tomking2/master. [Raphaël Vinot]
-
-  chg: Support for Payload Delivery > Other attribute as PyMISP function & search_index sharinggroup filter
-- Merge remote-tracking branch 'upstream/master' [Tom King]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #318 from cvandeplas/master. [Alexandre Dulaunoy]
-
-  sort describeTypes.json output
 - Sort describeTypes.json output. [Christophe Vandeplas]
 
   This is needed for the compatibility with the gen_misp_types_categories.py script. Data was sorted using the order_dict function of the gen_misp_types_categories script.
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #257 from mokaddem/usersStatistics. [Raphaël Vinot]
-
-  new: [usersStats] Possibility to fetch users/statistics
-- Merge pull request #311 from cvandeplas/master. [Raphaël Vinot]
-
-  Bugfixes
 
 
 v2.4.99 (2018-12-06)
@@ -150,16 +217,8 @@ Fix
 
 Other
 ~~~~~
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #310 from DragonDev1906/master. [Raphaël Vinot]
-
-  Added get_object & get_attribute (by ID)
 - Dded get_object & get_attribute. [DragonDev1906]
-- Merge pull request #307 from garanews/patch-1. [Raphaël Vinot]
-
-  fix for last pymisp version
 - Fix for last pymisp version. [garanews]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
 
 
 v2.4.98 (2018-12-03)
@@ -217,31 +276,13 @@ Fix
 
 Other
 ~~~~~
-- Merge pull request #305 from dawid-
-  czarnecki/feature/include_proposals. [Raphaël Vinot]
-
-  chg: Include proposals in attributes search
-- Merge pull request #301 from deralexxx/patch-7. [Raphaël Vinot]
-
-  mention virtualenv
 - Mention virtualenv. [Alexander J]
 
   mide make sense for people who want to use it with virtualenv
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
 - Be more precise with the supported time indicators. [Sascha
   Rommelfangen]
 - Fixed documentation bug. [Sascha Rommelfangen]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #295 from 3c7/fix/search_index_date. [Raphaël
-  Vinot]
-
-  Fixes date parameters for search_index() function
 - Fixes date parameters for search_index() function. [Nils Kuhnert]
-- Merge branch 'sightingAPI' [Raphaël Vinot]
-- Merge branch 'master' into sightingAPI. [Raphaël Vinot]
-- Merge pull request #285 from juju4/devel. [Raphaël Vinot]
-
-  align examples on custom usage of misp_verifycert
 - Align examples on custom usage of misp_verifycert. [juju4]
 
 
@@ -292,37 +333,16 @@ Fix
 
 Other
 ~~~~~
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #284 from mokaddem/fixFeedGenerator. [Sami
-  Mokaddem]
-
-  fix: prevent checking length on a integer
-- Merge pull request #283 from mokaddem/updateFromRedis. [Raphaël Vinot]
-
-  new: [freedFromRedis] try to create an object/attribute out of the in…
-- Merge branch 'IFX-CDC-master' [Raphaël Vinot]
 - Fixed leaked taxonomy tags problem. [netjinho]
 - Added some getters and setters for taxonomies, warninglists,
   noticelists and tags & documentation. [netjinho]
-- Merge branch 'netjinho-master' [Raphaël Vinot]
-- Merge branch 'master' of https://github.com/netjinho/PyMISP into
-  netjinho-master. [Raphaël Vinot]
 - Added update_galaxies and update_taxonomies. [netjinho]
-- Merge branch 'DragonDev1906-master' [Raphaël Vinot]
-- Merge branch 'master' of
-  https://github.com/DragonDev1906/PyMISP_upload_sample into
-  DragonDev1906-master. [Raphaël Vinot]
 - Add: Advanced Extraction to upload_sample. [root]
 - Add: update noticelists and object templates. [Raphaël Vinot]
 - Add: Add __eq__ to AbstractMISP. [Raphaël Vinot]
 
   Allow to discard duplicate tags.
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
 - Add: more test cases. [Raphaël Vinot]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #277 from GOVCERT-LU/pypi_fixes. [Raphaël Vinot]
-
-  - Add description from README.md as long-description -> displayed on …
 - Fix invalid py2 keyword. [Georges Toth]
 - - Add description from README.md as long-description -> displayed on
   pypi. - Add project related URLs to be displayed on pypi. [Georges
@@ -406,25 +426,9 @@ Fix
 
 Other
 ~~~~~
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #271 from SHSauler/patch-4. [Raphaël Vinot]
-
-  Fix #270 uniquely identifying sample
 - Fix #270 uniquely identifying sample. [Steffen Sauler]
 - Fix print. [Deborah Servili]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Alexandre Dulaunoy]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #251 from tomking2/master. [Alexandre Dulaunoy]
-
-  chg: Added email-header attribute
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
 - Revert "chg: Add travis tests on python 3.7" [Raphaël Vinot]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #252 from cvandeplas/master. [Christophe Vandeplas]
-
-  yara_dump - fixed private rules causing issues
 - Yara_dump - fixed private rules causing issues. [Christophe Vandeplas]
 
 
@@ -455,26 +459,11 @@ Changes
 
 Other
 ~~~~~
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #247 from neok0/master. [Raphaël Vinot]
-
-  enabled published search parameter for attributes controler
 - Enabled published search parameter for attributes controler. [Tobias
   Mainka]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #241 from cipherlock/master. [Raphaël Vinot]
-
-  new:Add the ability to add Other attributes via the API
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #238 from SHSauler/patch-3. [Raphaël Vinot]
-
-  Added download_samples(..., unzip=True)
 - Added unzip-flag. [Steffen Sauler]
 
   added: download_samples(..., unzip=True)
-- Merge pull request #235 from Lastpixl/master. [Raphaël Vinot]
-
-  chg: fix sample retrieval from new-style zips
 
 
 v2.4.92.1 (2018-06-05)
@@ -514,12 +503,8 @@ Fix
 
 Other
 ~~~~~
-- Merge pull request #232 from 0xiso/fix-docstring. [Alexandre Dulaunoy]
-
-  fix: Correct docstring of search method
 - Fix issue when adding multiple attributes and the instance is too
   slow. [Raphaël Vinot]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
 
 
 v2.4.90.1 (2018-05-09)
@@ -597,52 +582,17 @@ Fix
 Other
 ~~~~~
 - Added missing field to feed generator. [Andras Iklody]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #219 from cipherlock/new-add-asn-function. [Raphaël
-  Vinot]
-
-  new:Add the ability to add an Autonomous System(AS) via the API
 - Add the ability to add an Autonomous System(AS) via the API. [Paul
   Stark]
-- Merge pull request #218 from mokaddem/python3_shebang. [Raphaël Vinot]
-
-  Python3 shebang
 - Typo. [Sami Mokaddem]
 - Changed shebang to python3. [Sami Mokaddem]
-- Merge pull request #217 from 3c7/bugfix/url_default_category. [Raphaël
-  Vinot]
-
-  Update default category for url
 - Update default category for url as in
   https://github.com/MISP/MISP/pull/3119. [Nils Kuhnert]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #215 from mokaddem/jupyter_notebook. [Raphaël
-  Vinot]
-
-  Jupyter notebook
 - Deleted remaining outputs. [Sami Mokaddem]
 - First jupyter notebook tutorial (1 iterations) [Sami Mokaddem]
-- Merge pull request #210 from mlodic/master. [Raphaël Vinot]
-
-  added change_analysis_status API
 - Added change_analysis_status API. [Matteo Lodi]
-- Merge pull request #205 from mokaddem/hotfix_from_dict. [Raphaël
-  Vinot]
-
-  fix: AbstractMISP.from_dict() do not accept positional argument
-- Merge pull request #212 from
-  aparriel/fix_add_named_attribute_regression. [Raphaël Vinot]
-
-  Fix add named attribute regression
 - Fix add_named_attribute regression, update add_named_attribute.py
   example. [user]
-- Merge branch 'master' of https://github.com/MISP/PyMISP. [user]
-- Merge pull request #1 from aparriel/debug-fix. [aparriel]
-
-  Fix missing %s in logger.debug calls
-- Merge pull request #213 from P1sec/master. [Raphaël Vinot]
-
-  Example of specifying special attribute type in your search: here yara attribute
 - Example of specifying special attribute type in your search: here yara
   attribute. [Philippe Langlois]
 
@@ -680,10 +630,6 @@ Other
 - Update README.md. [Sami Mokaddem]
 
   Added example of flush operation
-- Merge pull request #204 from mokaddem/redis-feed-generator. [Alexandre
-  Dulaunoy]
-
-  Realtime feed generator
 - Added more examples. [Sami Mokaddem]
 - Added usage in README. [Sami Mokaddem]
 - Added MISPItemToRedis and updated readme accordingly. [Sami Mokaddem]
@@ -705,27 +651,11 @@ Other
 - Added support of MISP Object. [Sami Mokaddem]
 - Overhall seems to work, need testing. [Sami Mokaddem]
 - Init draft of redis to feed. [Sami Mokaddem]
-- Merge pull request #203 from weslambert/master. [Alexandre Dulaunoy]
-
-  fix typo(s)
 - Fix typo(s) [weslambert]
-- Merge pull request #198 from RichieB2B/client-cert. [Raphaël Vinot]
-
-  Point to right anchor for client side certificates
 - Point to right anchor for client side certificates. [Richard van den
   Berg]
-- Merge pull request #197 from RichieB2B/misp2cef. [Raphaël Vinot]
-
-  Add misp2cef example
 - Add misp2cef example. [Richard van den Berg]
-- Merge pull request #196 from RichieB2B/ncsc-nl/from_dict. [Raphaël
-  Vinot]
-
-  Fix misp2clamav
 - Use from_dict. [Richard van den Berg]
-- Merge pull request #195 from ANSSI-BSOD/patch-1. [Raphaël Vinot]
-
-  add search on sighting
 - Add search on sighting. [ANSSI-BSO-D]
 
   added the possibility to search sightings :
@@ -738,15 +668,8 @@ Other
   print(misp.sighting_list(element_id=42, org_id=2, scope=event))
   ```
   The return will be a sighting list of event 42 with a filter for organisation 2.
-- Merge pull request #189 from neok0/master. [Raphaël Vinot]
-
-  add attributes within objects as well, for tagging via value/id/uuid
 - Add attributes within objects as well, for tagging via value/id/uuid.
   [Tobias Mainka]
-- Merge pull request #190 from chrisr3d/master. [Raphaël Vinot]
-
-  Method to return an object by uuid
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
 
 
 v2.4.87.1 (2018-02-13)
@@ -777,10 +700,6 @@ Fix
 
 Other
 ~~~~~
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #186 from cudeso/master. [Alexandre Dulaunoy]
-
-  Prevent unpublished events to be included in feed
 - Prevent unpublished events to be included in feed. [Koen Van Impe]
 
   Change default proposed config
@@ -836,50 +755,23 @@ Other
 - Add: Allow to fetch warninglists. [Raphaël Vinot]
 
   Fix #180
-- Merge pull request #181 from LOUISLCE/feat-add-tests. [Raphaël Vinot]
-
-  Add and refactor some tests
 - Add tag test. [Louis LCE]
 - Add a simple test for uploading samples. [Louis LCE]
 - Add warning when failing to import dependencies. [Louis LCE]
 - Improve and refactor attributes tests. [Louis LCE]
-- Merge branch 'LDO-CERT-master' [Raphaël Vinot]
 - Sb-signature library. [garanews]
 
   Created sb-signature library with relative example for testing.
   Thanks @dadokkio
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #178 from CenturyLinkCIRT/master. [Raphaël Vinot]
-
-  Change in add_attachment.  Allow explicit attachment naming.
 - Linting. [Kory Kyzar]
 - Bug fix. [Kory Kyzar]
 - Change in add_attachment.  Allow explicit attachment naming. [Kory
   Kyzar]
-- Merge pull request #1 from MISP/master. [Kory Kyzar]
-
-  Syncing with upsteam
-- Merge pull request #177 from kirzaks/master. [Raphaël Vinot]
-
-  Change in new_tag function. Added attributie 'hide_tag'
 - Change in new_tag function. Added attributie 'hide_tag' [Armīns Palms]
-- Merge pull request #176 from kirzaks/master. [Raphaël Vinot]
-
-  Change the comment of attribute
 - Change the comment of attribute. [Armīns Palms]
-- Merge pull request #175 from LOUISLCE/fix-add-hashes-test. [Raphaël
-  Vinot]
-
-  Fix add_hashes online test function parameters
 - Fix add_hashes test function parameters. [Louis LCE]
-- Merge branch 'neok0-add-objects-template-file-path' [Raphaël Vinot]
-- Merge branch 'add-objects-template-file-path' of
-  https://github.com/neok0/PyMISP into neok0-add-objects-template-file-
-  path. [Raphaël Vinot]
 - Added misp object templates path argument. [Tobias Mainka]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
 - Update settings.default.py. [Andras Iklody]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
 
 
 v2.4.85.1 (2018-01-10)
@@ -907,7 +799,6 @@ Changes
   [Raphaël Vinot]
 
   fix #166
-- Default for sharing_group_id is 0. [Raphaël Vinot]
 - Add MISPSighting class. [Raphaël Vinot]
 - Bump Changelog. [Raphaël Vinot]
 
@@ -930,18 +821,9 @@ Fix
 
 Other
 ~~~~~
-- Merge pull request #164 from MISP/refactor. [Raphaël Vinot]
-
-  chg: Multiple changes
-- Merge pull request #162 from AninaAntonie/patch-1. [Raphaël Vinot]
-
-  fix: set_sightings
 - Set_sightings. [AninaAntonie]
 
   Maybe I didn't use it correctly but the method set_sightings didn't work for me. It's working now but I'm not sure whether sending a request for every sighting in the list is the best solution.
-- Merge pull request #165 from dadokkio/master. [Raphaël Vinot]
-
-  _default_attributes_parameters - if set - is a dict
 - _default_attributes_parameters - if set - is a dict. [Arcuri Davide]
 
   Manage distribution and sharing_group_id as dict key like the other fields.
@@ -992,24 +874,12 @@ Fix
 
 Other
 ~~~~~
-- Merge branch 'cvandeplas-master' [Raphaël Vinot]
-- Merge branch 'master' of https://github.com/cvandeplas/PyMISP into
-  cvandeplas-master. [Raphaël Vinot]
-- Merge remote-tracking branch 'MISP/master' [Christophe Vandeplas]
 - Fix MISPObject missing distribution and sharing_group_id. [Christophe
   Vandeplas]
 
   - fix MISPObject missing distribution concept
   - fix language typo paramaters => parameters
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #156 from cvandeplas/master. [Alexandre Dulaunoy]
-
-  document submodule downloading
 - Document submodule downloading. [Christophe Vandeplas]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #154 from wagner-certat/inc-meta. [Raphaël Vinot]
-
-  Include documentation and examples in source dist
 - Include documentation and examples in source dist. [Sebastian Wagner]
 
 
@@ -1041,31 +911,14 @@ Fix
 
 Other
 ~~~~~
-- Merge pull request #151 from MISP/refactor. [Raphaël Vinot]
-
-  chg: Make the library easier to use
-- Merge pull request #150 from sdrees/first-friendly-contribution-
-  enhance-coverage. [Raphaël Vinot]
-
-  First friendly contribution enhance coverage
 - Further tests added (for public methods) [Stefan Hagen (Individual)]
 - Changed asserts from dict usecases to set comparison to workaround non
   3.6 behavior. [Stefan Hagen (Individual)]
-- Merge branch 'master' of https://github.com/MISP/PyMISP into first-
-  friendly-contribution-enhance-coverage. [Stefan Hagen (Individual)]
 - Enhance coverage and fix en passant with focus on api. [Stefan Hagen
   (Individual)]
-- Merge branch 'truckydev-get_last_modified_event' [Raphaël Vinot]
-- Merge branch 'get_last_modified_event' of
-  https://github.com/truckydev/PyMISP into truckydev-
-  get_last_modified_event. [Raphaël Vinot]
 - - Correction for 'last' param. 'last' gives the latest events that
   have been published - add get_events_last_modified() this function
   returns the modified events based on timestamp. [Tristan METAYER]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #149 from naisanza/master. [Raphaël Vinot]
-
-  fix: Typo in error output text description
 
 
 v2.4.83 (2017-12-06)
@@ -1112,9 +965,6 @@ Fix
 
 Other
 ~~~~~
-- Merge pull request #147 from StrayLightning/master. [Raphaël Vinot]
-
-  Check explicitly for a 500 response from the server with no response content
 - Improve the exception message for a server 500+ response with no
   response content. [StrayLightning]
 - Check for zero-length 500 response from the server and produce a
@@ -1130,42 +980,15 @@ Other
   and raising a suitable exception.
 
   Also fix a missing bracket in one of the subsequent exception strings.
-- Merge pull request #146 from c-goes/lief_integrity_exception. [Raphaël
-  Vinot]
-
-  Make FileObject creation work if lief parsing fails
 - Make FileObject creation work if lief parsing fails. [c-goes]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #144 from c-goes/objects_delete. [Raphaël Vinot]
-
-  allow deletion of objects and object references
 - Allow deletion of objects and object references. [c-goes]
 - Update doc badge links. [Raphaël Vinot]
-- Merge pull request #143 from 3c7/feature/send_attributes. [Raphaël
-  Vinot]
-
-  Adding multiple named attributes (without proposal) require a single POST request now
 - Adding multiple named attributes require a single POST request now.
   [3c7]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #142 from c-goes/master. [Raphaël Vinot]
-
-  replaced is_digit() with isdigit()
 - Fixed typo. [c-goes]
-- Merge remote-tracking branch 'upstream/master' [c-goes]
-- Merge pull request #141 from SteveClement/master. [Raphaël Vinot]
-
-  Remove CIRCL repo references from README.md & fix epydoc
 - - Remove CIRCL reference from README.md - Updated 2 bad indentations
   where epydoc was Warning. [Steve Clement]
-- Merge remote-tracking branch 'upstream/master' [c-goes]
-- Merge branch 'master' of https://github.com/MISP/PyMISP into
-  messageidtype. [c-goes]
 - Added default_category for email-message-id. [c-goes]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge branch 'feature/feedgenerator_rework' [iglocska]
-- Merge branch 'master' of https://github.com/MISP/PyMISP into
-  feature/feedgenerator_rework. [iglocska]
 - Rework of the feed generator. [iglocska]
 
   - use objects, attribute tags and object references correctly
@@ -1218,16 +1041,7 @@ Fix
 
 Other
 ~~~~~
-- Merge pull request #126 from CenturyLinkCIRT/master. [Raphaël Vinot]
-
-  Added vt_to_misp.py example and VTReportObject
-- Merge branch 'master' of https://github.com/MISP/PyMISP. [Thomas
-  Gardner]
 - Fix test suite. [Raphaël Vinot]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #122 from LDO-CERT/master. [Raphaël Vinot]
-
-  Created add_generic_object.py
 - Created add_generic_object.py. [garanews]
 
   usage: add_generic_object.py [-h] -e EVENT -t TYPE -d DICT
@@ -1290,12 +1104,7 @@ Fix
 
 Other
 ~~~~~
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
 - Update openioc.py. [Andras Iklody]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #121 from kx499/master. [Raphaël Vinot]
-
-  Added **kwargs to add_named_attribute call in add_attachment
 - Added **kwargs to add_named_attribute call in add_attachment.
   [tssbo82]
 - Update README. [Raphaël Vinot]
@@ -1337,28 +1146,16 @@ Other
 - Up: Version bump. [Raphaël Vinot]
 - Up: Bump misp-objects & describeTypes. [Raphaël Vinot]
 - Update readme. [Raphaël Vinot]
-- Merge pull request #116 from cgi1/patch-2. [Raphaël Vinot]
-
-  Similar to #114 on attribute level
 - Similar to #114 on attribute level. [cgi1]
 
   `add_attribute_tag(tag,attribute_identifier)` fails if attribute does not have any tag in before.
-- Merge pull request #115 from cgi1/patch-1. [Raphaël Vinot]
-
-  Fixing #114 (MISPEvent.add_tag(tag) fails if inital event does not contain tag )
 - Fixing #114. [cgi1]
-- Merge pull request #112 from CenturyLinkCIRT/unknown-object-name-
-  patch. [Raphaël Vinot]
-
-  Formatted "Unknown MISP object" error message
 - Formatted "Unknown MISP object" error message. [infosec-intern]
 
   When a user tries to add an object with a name that doesn't exist, the error thrown was missing its format string
   This ended up looking like
   pymisp.exceptions.UnknownMISPObjectTemplate: {} is unknown in the MISP object directory.
   Here's a patch that adds self.name to the format string
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #111 from wagner-certat/skip-tests. [Raphaël Vinot]
 - TST: skip test with optional files if not existing. [Sebastian Wagner]
 - TST: update test requirements. [Sebastian Wagner]
 - Update: make make_binary_objects more flexible. [Raphaël Vinot]
@@ -1369,14 +1166,10 @@ Other
 v2.4.80 (2017-09-18)
 --------------------
 - Properly initialize a new malware sample. [Raphaël Vinot]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
 - Permission issue... [Alexandre Dulaunoy]
-- Merge branch 'objects' [Raphaël Vinot]
 - Bump misp object. [Raphaël Vinot]
 - Allow to get the list of known types out of MISPEvent again. [Raphaël
   Vinot]
-- Merge branch 'objects' of github.com:MISP/PyMISP into objects.
-  [Raphaël Vinot]
 - Changed source => object / destination => referenced. [iglocska]
 - Use MISPAbstract as a master class everywhere. [Raphaël Vinot]
 
@@ -1428,13 +1221,8 @@ Other
 ~~~~~
 - Version bump. [Raphaël Vinot]
 - Exact match on the value when adding tag. [Raphaël Vinot]
-- Merge pull request #105 from Deventual/patch-10. [Alexandre Dulaunoy]
-
-  Update README.md
 - Update README.md. [Deventual]
 - Improve event ID detection in publish method. [Raphaël Vinot]
-- Merge branch 'patch-8' of https://github.com/Deventual/PyMISP into
-  Deventual-patch-8. [Raphaël Vinot]
 - Update api.py. [Deventual]
 - Implemented much faster publish method to replace the old one.
   [Deventual]
@@ -1443,17 +1231,10 @@ Other
   The method depends on the publish misp api method instead of update.
 - Update path to roles API. [Raphaël Vinot]
 - Fix typo in variable name. [Raphaël Vinot]
-- Merge pull request #99 from edhoedt/patch-1. [Raphaël Vinot]
-
-  Fixing undefined ressources_path
 - Fixing undefined ressources_path. [edhoedt]
 - Allow to load the event_id in MISPAttrbute. [Raphaël Vinot]
 - Doesn't require describe_types in MISPAttribute's constructor.
   [Raphaël Vinot]
-- Merge pull request #98 from wagner-certat/fix-shebang-exec. [Raphaël
-  Vinot]
-
-  Fix shebangs and executable permissions
 - Fix shebangs and executable permissions. [Sebastian Wagner]
 
   Files containing a shebang should be executable (examples/*.py)
@@ -1505,13 +1286,6 @@ Other
 - Avoid a comment set to NoneNone. [Raphaël Vinot]
 
   Fix https://github.com/MISP/misp-modules/issues/127
-- Merge pull request #110 from spacepatcher/master. [Raphaël Vinot]
-
-  Add handling a string response
-- Merge pull request #1 from spacepatcher/spacepatcher-patch-api. [Alex
-  Bolshakov]
-
-  Add handling a string response
 - Add handling a string response. [Alex Bolshakov]
 
   To avoid AttributeError when variable to_return is a string with a value "Pull queued for background execution."
@@ -1524,70 +1298,38 @@ Other
 
   This reverts commit acd6d8b0523963baecb3b6e8f4c77b1466045dd4.
 - Fix OpenIOC import. [Raphaël Vinot]
-- Merge branch 'master' of github.com:CIRCL/PyMISP. [Raphaël Vinot]
-- Merge pull request #109 from raw-data/master. [Raphaël Vinot]
-
-  Fix suricata_search and new PyMISP methods
 - Exposing more feeds functions (for which  _isRest() is available) to
   the API. [raw-data]
 - Fix args.quiet and status msgs. [raw-data]
-- Merge pull request #95 from obsidianpentesting/master. [Raphaël Vinot]
-
-  Create cache feeds function in PyMISP
 - Example script to invoke the cache_all_feeds() from PyMISP.
   [obsidianpentesting]
 - Simple function to cache all feeds at once. This is almost identical
   to fetch_feed. In the future, I would like to specify the scope to
   include other values. [obsidianpentesting]
 - Doc version updated to 2.4.71. [Alexandre Dulaunoy]
-- Merge pull request #107 from raw-data/master. [Alexandre Dulaunoy]
-
-  multi-threaded suricata search
 - Add multithreaded suricata search code, fetching ids rules based on
   parameters and terms. [raw-data]
-- Merge branch 'master' of github.com:CIRCL/PyMISP. [Alexandre Dulaunoy]
-- Merge pull request #106 from deralexxx/patch-3. [Raphaël Vinot]
-
-  use misp_verifycert
 - Use misp_verifycert. [Alexander J]
 
   from keys.py
-- Merge pull request #102 from aparriel/debug-fix. [Raphaël Vinot]
-
-  Fix missing %s in debug
 - Fix missing %s in debug. [aparriel]
 
   Missing %s in logger.debug call lead to error.
-- Merge pull request #92 from deralexxx/patch-4. [Alexandre Dulaunoy]
-
-  use misp_verifycert
 - Use misp_verifycert. [Alexander J]
 
   misp_verifycert
-- Merge pull request #93 from deralexxx/patch-6. [Alexandre Dulaunoy]
-
-  Create README.md
 - Create README.md. [Alexander J]
 - Add support for freetext import in the API. [Raphaël Vinot]
 - Typo fixed. [Alexandre Dulaunoy]
 
   Paris is not the center of the world as the idiot of the World village
   would said.
-- Merge pull request #100 from CheYenBzh/master. [Alexandre Dulaunoy]
-
-  Automation for fetching all events from a feed
 - Create fetch_events_feed.py. [CheYenBzh]
 - Add function to fetch all events from a feed. [CheYenBzh]
 
   Function takes the feed id as argument (-f).
 - Make pep8 happy. [Raphaël Vinot]
-- Merge pull request #88 from kajogo777/87. [Raphaël Vinot]
-
-  Fix not_values type check in __prepare_rest_search issue #87
 - Fix not_values type check in __prepare_rest_search. [George]
-- Merge pull request #84 from truckydev/master. [Raphaël Vinot]
-
-  correction, refactoring, addition
 - Correction for https://travis-ci.org/MISP/misp-modules/jobs/231065469.
   [Tristan METAYER]
 
@@ -1596,9 +1338,6 @@ Other
   add new composite
 - Cleanup warning function. [Raphaël Vinot]
 - Fix typos. [Raphaël Vinot]
-- Merge pull request #82 from truckydev/master. [Raphaël Vinot]
-
-  add mapping and composite feature
 - Remove unused variable. [Tristan METAYER]
 - Remove category It will be automaticly detected
   https://github.com/MISP/PyMISP/blob/master/pymisp/tools/openioc.py.
@@ -1606,40 +1345,17 @@ Other
 - Revert tab to escape. [Tristan METAYER]
 - Ajout de mapping Ajout de la prise en compte d'autre composite.
   [Tristan METAYER]
-- Merge pull request #83 from bernhl/fix_api_version_check. [Raphaël
-  Vinot]
-
-  Fix checks of recommended version
 - Fix checks of recommended version. [Lukas Bernhard]
-- Merge pull request #81 from bernhl/logging. [Raphaël Vinot]
-
-  Use logging instead of print; deprecate debug param
-- Merge branch 'master' into logging. [Raphaël Vinot]
-- Merge pull request #80 from bernhl/exception_types. [Raphaël Vinot]
-
-  Add exception types to api.py
 - Add exception types to api.py. [fluxas]
 - Use logging instead of print; deprecate debug param. [fluxas]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Hannah Ward]
-- Merge pull request #79 from PaulSec/master. [Raphaël Vinot]
-
-  Normalize output between misp.search_index and misp.search
 - Normalize output between misp.search_index and misp.search Fix issue:
   https://github.com/CIRCL/PyMISP/issues/78. [Paul A]
-- Merge pull request #77 from PaulSec/master. [Raphaël Vinot]
-
-  Fixed the JSON output format (\n breaks JSON loading afterwards)
 - Fixed the JSON output format (\n breaks JSON loading afterwards) [Paul
   A]
-- Merge branch 'async' [Hannah Ward]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Hannah Ward]
 - Add: gitchangelogrc configuration file added. [Alexandre Dulaunoy]
 - Quick and dirty fix for #97. [Raphaël Vinot]
 - Update offline tests. [Raphaël Vinot]
 - Fix testing. [Raphaël Vinot]
-- Merge pull request #74 from SekoiaLab/test/unitTests. [Raphaël Vinot]
-
-  test: add test for user and organisation
 - Test: add test for user and organisation. [Adrien RAFFIN]
 
   This is a proposition of test to create a user and an organisation in MISP
@@ -1671,18 +1387,6 @@ Other
 ~~~~~
 - Update types. [Raphaël Vinot]
 - Version Dump. [Raphaël Vinot]
-- Merge pull request #69 from SekoiaLab/fix/serverCreation. [Raphaël
-  Vinot]
-
-  Fix/server creation
-- Merge pull request #71 from SekoiaLab/fix/remoteOrgUUID. [Raphaël
-  Vinot]
-
-  fix: raise exception if uuid not setted in remote org
-- Merge pull request #72 from SekoiaLab/feat/getAllOrganisations.
-  [Raphaël Vinot]
-
-  feat: add filter to specify which organisation to list
 - Feat: add filter to specify which organisation to list. [Adrien
   RAFFIN]
 - Update validation. [Raphaël Vinot]
@@ -1690,44 +1394,20 @@ Other
   * Allow strict validation
   * Add workaround to avoid all JSON dumps from MISP <=2.4.70 to fail
 - Update test file. [Raphaël Vinot]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Hannah Ward]
-- Merge pull request #68 from PaulSec/patch-1. [Raphaël Vinot]
-
-  Updated last.py to dump json results straight away
 - Update last.py. [Paul]
 - Updated last.py to dump json results straight away. [Paul]
 
   Output was not usable with cli utilities such as: ```cat results.json | python -m simplejson.tool```.
   It's now usable and works perfectly.
-- Merge branch 'master' of github.com:MISP/PyMISP. [Hannah Ward]
-- Merge pull request #66 from YacineKhamis/master. [Raphaël Vinot]
-
-  Treemap.py requirements updated in the README.MD file
 - Treemap.py requirements updated in the README.MD file. [Student CIRCL]
 - Major rewrite of the schema. [Raphaël Vinot]
-- Merge branch 'master' of github.com:CIRCL/PyMISP. [Raphaël Vinot]
-- Merge pull request #95 from RichieB2B/ncsc-nl/send-attributes.
-  [Raphaël Vinot]
-
-  Return json when adding attributes
 - Return json when adding attributes. [Richard van den Berg]
 - Properly display deprecation warning. [Raphaël Vinot]
 - Fix python 3 support. [Raphaël Vinot]
 
   Fix #94
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge branch 'master' of github.com:CIRCL/PyMISP. [Alexandre Dulaunoy]
 - Cleanup misp2clamav. [Raphaël Vinot]
-- Merge branch 'master' of github.com:CIRCL/PyMISP. [Raphaël Vinot]
-- Merge pull request #93 from RichieB2B/ncsc-nl/misp2clamav. [Alexandre
-  Dulaunoy]
-
-  Convert MISP file hashes to ClamAV hdb file
 - Add misp2clamav. [Richard van den Berg]
-- Merge pull request #63 from TheDr1ver/patch-5. [Raphaël Vinot]
-
-  publish_timestamp Windows 7 Fix
 - Extended the Windows fix to lines 168 and 471. [Nick Driver]
 - Publish_timestamp Windows 7 Fix. [Nick Driver]
 
@@ -1737,17 +1417,10 @@ Other
 - Add an attributes to an event without sending the full existing event.
   [Raphaël Vinot]
 - Allow to pass None to to_ids, default to sane default. [Raphaël Vinot]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #61 from iglocska/master. [Raphaël Vinot]
-
-  Small change to make travis happy
 - Small change to make travis happy. [iglocska]
 
   - attribute_count default changed to 0 in misp
 - Fix add_domain_ip. [Déborah Servili]
-- Merge pull request #60 from TheDr1ver/patch-3. [Alexandre Dulaunoy]
-
-  Example using the search() function
 - Example using the search() function. [Nick Driver]
 
   Accepts specific parameters from search() instead of just using search_all().
@@ -1758,20 +1431,10 @@ v2.4.68 (2017-03-09)
 --------------------
 - Version bump. [Raphaël Vinot]
 - Fix tests. [Raphaël Vinot]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #58 from rmarsollier/master. [Raphaël Vinot]
-
-  Using the facilities introduced by MISP commit ...
 - Using the facilities introduced by MISP commit
   bdbd0920ba760a514cffdb30cc741b61b589d9da (fix: attachTagToObject and
   removeTagFromObject now accept posted JSON objects) [rmarsollier]
-- Merge pull request #56 from rmarsollier/master. [Raphaël Vinot]
-
-  throw exception for invalid uuid
 - Throw exception for invalid uuid. [rmarsollier]
-- Merge pull request #55 from rmarsollier/master. [Raphaël Vinot]
-
-  example using tag() function instead of add_tag()
 - Example using tag() function instead of add_tag() [rmarsollier]
 - Reorganisation, make add attribute more flexible. [Raphaël Vinot]
 - Properly split ip:port for ipv4 (openioc import) [Raphaël Vinot]
@@ -1780,7 +1443,6 @@ v2.4.68 (2017-03-09)
 
 v2.4.67 (2017-02-27)
 --------------------
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
 - Install PyMISP with python3 by default. [Raphaël Vinot]
 
   Because reasons.
@@ -1798,35 +1460,17 @@ v2.4.67 (2017-02-27)
 - Allow filenames with regexes. [Raphaël Vinot]
 
   Fix #52
-- Merge pull request #53 from SekoiaLab/feature/serversRestApi. [Raphaël
-  Vinot]
-
-  Adds new methods to add and edit servers in MISP
 - Feature: Adds new methods to edit servers in MISP. [Sebastien Quioc]
 - Feature: Adds new methods to add new servers in MISP. [Sebastien
   Quioc]
-- Merge pull request #51 from SekoiaLab/feature/AddAuthkeyAtCreation.
-  [Raphaël Vinot]
-
-  feature: Add support for authkey in PyMISP operations
 - Feature: Add support for authkey in PyMISP operations. [Adrien RAFFIN]
 - Update tests. [Raphaël Vinot]
 
   Fix #86
-- Merge pull request #85 from MISP/errorhandling2. [Alexandre Dulaunoy]
-
-  Errorhandling2
-- Merge branch 'master' into errorhandling2. [iglocska]
-- Merge branch 'master' of github.com:CIRCL/PyMISP. [Raphaël Vinot]
-- Merge pull request #84 from RichieB2B/ncsc-nl/fix-distribution.
-  [Raphaël Vinot]
-
-  Allow 'Your organisation only' distribution for attributes
 - Allow 'Your organisation only' distribution for attributes. [Richard
   van den Berg]
 - Potential fix for the errors not being picked up by pymisp from the
   response "errors" field. [iglocska]
-- Merge branch 'master' into travisfix. [iglocska]
 - Add method to set sightings from a string. [Raphaël Vinot]
 - Fix travis online. [Raphaël Vinot]
 - Update bundled-in describeTypes.json. [Raphaël Vinot]
@@ -1846,20 +1490,10 @@ Other
 - Add support for {attach,remove}TagToObject. [Raphaël Vinot]
 
   Fix #47
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
 - Add legend. [Déborah Servili]
-- Merge branch 'master' of https://github.com/MISP/PyMISP. [Déborah
-  Servili]
-- Merge pull request #49 from cvandeplas/master. [Alexandre Dulaunoy]
-
-  YARA dumper for all rules
 - YARA dumper for all rules. [Christophe Vandeplas]
 
   This dumper also does YARA rule validation, ignores invalid rules and prevents duplicate rule names. The output is a file called misp.yara which can be used with your favorite YARA tool.
-- Merge pull request #50 from cvandeplas/feature_get_all_attributes_txt.
-  [Alexandre Dulaunoy]
-
-  get_all_attributes_txt - support the additional flags
 - Get_all_attributes_txt - support the additional flags. [Christophe
   Vandeplas]
 - Restore file deleted by mistake. [Déborah Servili]
@@ -1891,10 +1525,6 @@ Other
   * Improve version checking
   * Fix attribute update
 - Allow to add a tag to a MISPEvent and MISPAttribute. [Raphaël Vinot]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Hannah Ward]
-- Merge pull request #41 from deralexxx/patch-1. [Raphaël Vinot]
-
-  make it little more readable
 - Make it little more readable. [Alexander J]
 
   guess that way it is easier to understand
@@ -1917,20 +1547,13 @@ Other
 - Fix python3 support. [Raphaël Vinot]
 - Bump version. [Raphaël Vinot]
 - Add orgs managment. [Raphaël Vinot]
-- Merge branch 'master' of https://github.com/MISP/PyMISP. [Déborah
-  Servili]
 - Run on more python versions. [Raphaël Vinot]
 - Exemple addtag (dirty) [Déborah Servili]
 - Fix last commit. [Raphaël Vinot]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge pull request #83 from cudeso/master. [Alexandre Dulaunoy]
-
-  Wrong use of API for dateuntil
 - Wrong use of API for dateuntil. [Koen Van Impe]
 
   PyMISP uses “dateto” whereas the API expects “dateuntil”.
   https://github.com/MISP/misp-book/tree/master/automation
-- Merge remote-tracking branch 'CIRCL/master' [Koen Van Impe]
 - Refactoring search method. [Raphaël Vinot]
 - Revert "Add options to restsearch calls." [Raphaël Vinot]
 
@@ -1939,18 +1562,12 @@ Other
 
   Related to:
   https://github.com/MISP/MISP/commit/8c63e6f3d54a262bc4bf6f77138c058287be5826
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
 - Doc link updated. Fix #39. [Alexandre Dulaunoy]
-- Merge pull request #81 from cvandeplas/master. [Alexandre Dulaunoy]
-
-  Minor documentation clarification
 - Minor documentation clarification. [Christophe Vandeplas]
 - Fix typo. [Raphaël Vinot]
 - Fix last commit. [Raphaël Vinot]
 - Add support for attribute level tagging. [Raphaël Vinot]
 - Fix travis. [Raphaël Vinot]
-- Merge branch 'master' of git://github.com/cgi1/PyMISP into
-  cgi1-master. [Raphaël Vinot]
 - + separate function change_sharing_group using update_event. [cgi]
 - Allow to update an event by UUID, syntax fixes. [Raphaël Vinot]
 - Update tests. [Raphaël Vinot]
@@ -1958,9 +1575,6 @@ Other
 
   Fix #79
 - Add new key in online test. [Raphaël Vinot]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Merge branch 'master' of https://github.com/truckydev/PyMISP. [Hannah
-  Ward]
 - Idem. [Tristan METAYER]
 - Refere to FloatingGhost comment. [Tristan METAYER]
 - Add uuid serch with pymisp. [Tristan METAYER]
@@ -1989,8 +1603,6 @@ v2.4.56 (2016-12-09)
 - Fix typo in add_mutex. [Raphaël Vinot]
 - Added galaxyies to the test. [Iglocska]
 - Reorganize json dumps. [Raphaël Vinot]
-- Merge branch 'nbareil-master' [Raphaël Vinot]
-- Fix merge conflict, make pep8 happy. [Raphaël Vinot]
 - Map() is a generator in Python3. [Nicolas Bareil]
 - Python3 does not like lambda (x,y) syntax. [Nicolas Bareil]
 - Unit-tests. [Nicolas Bareil]
@@ -1999,20 +1611,12 @@ v2.4.56 (2016-12-09)
 - Factorize all add_* in favor of add_named_attribute() [Nicolas Bareil]
 
   Not tested...
-- Merge pull request #31 from morallo/master. [Raphaël Vinot]
-
-  Added test for search_index and solved warnings
-- Added test for search_index by tag string. [morallo]
 - Fixed missing parenthesis. [morallo]
 - Fixed synthax error. [morallo]
 - Solved warnings in tests when run under Python3. [morallo]
 - Added test case for search_index by tag. [morallo]
 - Fix neo4j. [Raphaël Vinot]
 - Remove crazy replace. [Raphaël Vinot]
-- Merge branch 'master' of github.com:CIRCL/PyMISP. [Raphaël Vinot]
-- Merge pull request #74 from FloatingGhost/master. [Raphaël Vinot]
-
-  Use convert's load_stix method
 - Use misp_stix_converter.converters.convert's load_stix method. [Hannah
   Ward]
 - Improve debug mode. [Raphaël Vinot]
@@ -2036,15 +1640,10 @@ v2.4.54 (2016-11-16)
 
   commit 8a5dfda8a728d8722dfba890729066948e744e44
 - Fix openioc loader, update mapping. [Raphaël Vinot]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Raphaël Vinot]
-- Improvements in the user api. [Déborah Servili]
 - Neo4j stuff moved into graphdb directory. [Alexandre Dulaunoy]
 - Moving Neo4j into graphdb. [Alexandre Dulaunoy]
 - Improvements in the user api. [Déborah Servili]
 - Fix package installation. [Raphaël Vinot]
-- Merge pull request #68 from MISP/tooling. [Raphaël Vinot]
-
-  [WIP] Tooling
 - Add some mapping to openioc, add python version in the user agent.
   [Raphaël Vinot]
 - Initial version of the OpenIOC loader. [Raphaël Vinot]
@@ -2055,8 +1654,6 @@ v2.4.54 (2016-11-16)
 - Fix Python2 - Python3 support. [Raphaël Vinot]
 - Cleanup neo4j support. [Raphaël Vinot]
 - Add simple script to push MISP events into Neo4j. [Raphaël Vinot]
-- Add user management and examples. [Déborah Servili]
-- Merge branch 'master' of github.com:CIRCL/PyMISP. [Raphaël Vinot]
 - Properly warn if the user is using python2. [Raphaël Vinot]
 - Allow to load a MISP event without attributes. [Raphaël Vinot]
 - Add user management and examples. [Déborah Servili]
@@ -2065,16 +1662,8 @@ v2.4.54 (2016-11-16)
 
 v2.4.53 (2016-10-21)
 --------------------
-- Merge pull request #67 from CIRCL/next. [Raphaël Vinot]
-
-  Major refactoring, release v2.4.53
 - Bump to v2.4.53. [Raphaël Vinot]
 - Cleanup. [Raphaël Vinot]
-- Merge branch 'master' of github.com:CIRCL/PyMISP into next. [Raphaël
-  Vinot]
-- Merge pull request #66 from tomking2/master. [Raphaël Vinot]
-
-  Including Network-Other option for API
 - Including Network-Other option for API. [Tom]
 - Fix Python2 support. [Raphaël Vinot]
 - Print a warning in case python2 is used. [Raphaël Vinot]
@@ -2105,9 +1694,6 @@ v2.4.53 (2016-10-21)
 - Getting closed to a full support of a misp event as a Python Object.
   [Raphaël Vinot]
 - First batch of changes, will be squashed. [Raphaël Vinot]
-- Merge pull request #64 from FloatingGhost/master. [Raphaël Vinot]
-
-  Fixed search_index
 - Fixed search_index. [Hannah Ward]
 - Toggle flag instead of value. [Alexandre Dulaunoy]
 
@@ -2116,13 +1702,9 @@ v2.4.51.1 (2016-09-12)
 ----------------------
 - Version bump. [Raphaël Vinot]
 - Fix examples after removal of MISP XML support. [Raphaël Vinot]
-- Merge pull request #27 from Delta-Sierra/master. [Alexandre Dulaunoy]
-
-  Add Examples
 - Add some examples. [Déborah Servili]
 - Add tags_to_graphs.py in ecamples/situational-awareness. [Déborah
   Servili]
-- Merge https://github.com/MISP/PyMISP. [Déborah Servili]
 - Update examples/situational-awareness/README.md. [Déborah Servili]
 - Update examples/situational-awareness/README.md. [Déborah Servili]
 
@@ -2140,17 +1722,8 @@ v2.4.51 (2016-08-29)
 - Update doc. [Raphaël Vinot]
 - Add doc. [Raphaël Vinot]
 - Update documentation for client side certificate. [Raphaël Vinot]
-- Merge pull request #62 from RichieB2B/nscs-nl/ssl-client-cert.
-  [Raphaël Vinot]
-
-  Add ssl client certificate support
 - Add ssl client certificate support. [Richard van den Berg]
 - Add auth error test. [Raphaël Vinot]
-- Merge branch 'master' of github.com:CIRCL/PyMISP. [Raphaël Vinot]
-- Merge pull request #61 from RichieB2B/ncsc-nl/speedup-et2misp.
-  [Alexandre Dulaunoy]
-
-  Speed up et2misp
 - Speed up et2misp. [Richard van den Berg]
 - Add some more tests. [Raphaël Vinot]
 - Add tests. [Raphaël Vinot]
@@ -2166,9 +1739,6 @@ v2.4.51 (2016-08-29)
 v2.4.50 (2016-08-17)
 --------------------
 - Version bump. [Raphaël Vinot]
-- Merge pull request #26 from jbremer/master. [Raphaël Vinot]
-
-  Various improvements
 - Provide sane defaults for upload-sample/samplelist. [Jurriaan Bremer]
 
   Most of the arguments are unused when a proper event ID has been
@@ -2178,32 +1748,17 @@ v2.4.50 (2016-08-17)
 
   Slightly worked out version of the suggestion by doomedraven in #42.
 - Fix tests. [Raphaël Vinot]
-- Merge pull request #60 from RichieB2B/ncsc-nl/et2misp. [Alexandre
-  Dulaunoy]
-
-  Add Emerging Threat to MISP example
 - Add et2misp example. [Richard van den Berg]
-- Merge pull request #59 from tomking2/master. [Raphaël Vinot]
-
-  Fixed double status code check on helpers and other functions
 - Fixed double status code check on helpers and other functions. [Thomas
   King]
 - Proper support of functions returning plain text instead of json.
   [Raphaël Vinot]
-- Merge branch 'master' of github.com:CIRCL/PyMISP. [Raphaël Vinot]
-- Merge pull request #57 from sebix/fix-test. [Raphaël Vinot]
-
-  Fix prints in tests
 - Fix prints in tests. [Sebastian Wagner]
 - Fix calls to __prepare_session. [Raphaël Vinot]
 
   Fix #58
 - Change: remove XML output, all functions return a Python dictionary.
   [Raphaël Vinot]
-- Merge pull request #55 from RichieB2B/ncsc-nl/fix-distribution.
-  [Raphaël Vinot]
-
-  Set default distribution for attributes to inherit
 - Set default distribution for attributes to inherit. [Richard van den
   Berg]
 - Properly handle errors while fetching the types. [Raphaël Vinot]
@@ -2216,14 +1771,7 @@ v2.4.50 (2016-08-17)
 v2.4.49 (2016-08-02)
 --------------------
 - Version bump. [Raphaël Vinot]
-- Merge pull request #24 from Delta-Sierra/master. [Raphaël Vinot]
-
-  Fix fetching method for tag_search and tags_count
 - Fix fetching method for tag_search and tags_count. [Raphaël Vinot]
-- Merge branch 'master' of github.com:CIRCL/PyMISP. [Raphaël Vinot]
-- Merge pull request #52 from KennethAdamMiller/master. [Raphaël Vinot]
-
-  Caught exception on python3.4 where base64encode returns bytes
 - Caught exception on python3.4 where base64encode returns bytes and not
   str, and bytes are not json encodable. This caused a failure in
   upload_sample. [Kenneth Adam Miller]
@@ -2231,47 +1779,27 @@ v2.4.49 (2016-08-02)
 - Add support for proxies in the library. [Raphaël Vinot]
 
   Fix #48
-- Merge branch 'master' of github.com:CIRCL/PyMISP. [Raphaël Vinot]
-- Merge pull request #51 from ek0/add_detection_name. [Alexandre
-  Dulaunoy]
-
-  Add a method to add a textual detection name under the 'Antivirus detection' category
 - Add a method to add a textual detection name under the 'Antivirus
   detection' category. [Jessy Campos]
 - Major refactoring of the SVG generator. [Raphaël Vinot]
 - Initial refactoring, PEP8 and cleanup. [Raphaël Vinot]
-- Merge pull request #23 from Delta-Sierra/master. [Raphaël Vinot]
-
-  Add tags_count and tag_search script in examples/situational-awareness/
 - Update README.md. [Deborah Servili]
 - Make printed date more consistent + update README.md. [Déborah
   Servili]
-- Merge https://github.com/MISP/PyMISP. [Déborah Servili]
-- Merge pull request #22 from 3c7/patch-1. [Raphaël Vinot]
 - Fixes: expected bytes, got <class 'str'> in download_samples() [Nils]
-- Merge pull request #49 from FloatingGhost/master. [Raphaël Vinot]
-
-  Added STIX retrieval
 - Added STIX retrieval    - misp.get_stix(event_id=ID,
   with_attachment=True/False,                        from_date=YYYY-MM-
   DD, to_date=YYYY-MM-DD,                       tags=["tag1", "tag2"]
   ) [Hannah Ward]
-- Merge pull request #3 from Delta-Sierra/newbranch. [Deborah Servili]
-- Merge branch 'master' of https://github.com/Delta-Sierra/PyMISP into
-  newbranch. [Déborah Servili]
 - Update tools.py. [Deborah Servili]
 
   Correct function isTagIn(dataframe, tag)
-- Merge pull request #2 from Delta-Sierra/newbranch. [Deborah Servili]
 - Modify fetching method to use last. [Déborah Servili]
 - Handling some NaN exceptions. [Déborah Servili]
-- Delete some files. [Déborah Servili]
-- Merge pull request #1. [Deborah Servili]
 - Rename examples/statistics/attribute_treemap.py to
   examples/treemap/treemap.py. [Deborah Servili]
 - Move files from examples/treemap to examples/situational-awareness/
   [Déborah Servili]
-- Merge https://github.com/MISP/PyMISP into newbranch. [Déborah Servili]
 - Rename examples/treemap/treemap.py to
   examples/statistics/attribute_treemap.py. [Deborah Servili]
 
@@ -2282,32 +1810,16 @@ v2.4.48.2 (2016-07-11)
 - Add remove tag method. [Raphaël Vinot]
 - Use same variable names as testing environment. [Raphaël Vinot]
 - Make scripts executable. [Raphaël Vinot]
-- Merge pull request #21 from Delta-Sierra/master. [Alexandre Dulaunoy]
-
-  Add examples "create_dummy_event" and "create_massive_dummy_events"
 - Random names for dummy files. [Déborah Servili]
 - Add examples "create_dummy_event" and "create_massive_dummy_events"
   [Déborah Servili]
-- Merge pull request #46 from plutec/master. [Raphaël Vinot]
-
-  Update README.md with install instructions
 - Update README.md with install instructions. [Antonio Sánchez]
-- Merge pull request #44 from plutec/master. [Alexandre Dulaunoy]
-
-  Added function to AV detection link
 - Added function to AV detection link. [Antonio S]
-- Merge pull request #43 from plutec/master. [Alexandre Dulaunoy]
-
-  Added add_domain_ip function for attribute
 - Added add_domain_ip attribute function. [Antonio S]
-- Merge pull request #20 from Delta-Sierra/master. [Alexandre Dulaunoy]
-
-  Add example "create attributes distribution treemap"
 - Remove useless comments. [Déborah Servili]
 - Add example "create attributes distribution treemap" [Déborah Servili]
 - Fix python3 compat. Make Pep8 happy. [Raphaël Vinot]
 - Make pep8 happy. [Raphaël Vinot]
-- Merge branch 'master' of github.com:CIRCL/PyMISP. [Raphaël Vinot]
 - Comment removed. [Alexandre Dulaunoy]
 
 
@@ -2321,35 +1833,17 @@ v2.4.48.1 (2016-06-15)
 v2.4.48 (2016-06-09)
 --------------------
 - Tag version 2.4.48. [Raphaël Vinot]
-- Merge pull request #19 from Delta-Sierra/master. [Alexandre Dulaunoy]
-
-  add function get_tags_statistics
 - Add function get_tags_statistics. [Déborah Servili]
 - File indention fixed. [Alexandre Dulaunoy]
-- Merge pull request #18 from Delta-Sierra/master. [Alexandre Dulaunoy]
-
-  add function get_sharing_groups
 - Add function get_sharing_groups. [Déborah Servili]
-- Merge pull request #40 from ANSSI-BSOD/master. [Alexandre Dulaunoy]
-
-  import ioc with python
 - Form. [ANSSI-BSO-D]
 - Init for ioc-2-misp. [Tristan METAYER]
-- Merge pull request #39 from kevthehermit/master. [Alexandre Dulaunoy]
-
-  Add Attribute by named category and type
 - Add Attribute by named category and type. [KevTheHermit]
-- Merge pull request #17 from Delta-Sierra/master. [Alexandre Dulaunoy]
-
-  Add function for sighting using attribute id, uuid or a json file
 - Add function for sighting using attribute id, uuid or a json file.
   [Déborah Servili]
 - More stats example. [Alexandre Dulaunoy]
 - Debug print removed. [Alexandre Dulaunoy]
 - Statistics test script added. [Alexandre Dulaunoy]
-- Merge pull request #16 from Delta-Sierra/master. [Alexandre Dulaunoy]
-
-  add function get_attributes_statistics
 - Add function get_attributes_statistics. [Déborah Servili]
 - Add 'add_yara' to upload yara rules, increase flexibility of config.
   [Raphaël Vinot]
@@ -2360,35 +1854,13 @@ v2.4.48 (2016-06-09)
 v2.4.36 (2016-04-15)
 --------------------
 - Update version to v2.4.36. [Raphaël Vinot]
-- Merge pull request #15 from Delta-Sierra/master. [Alexandre Dulaunoy]
-
-  add comment field in upload_sample
 - Add comment field in upload_sample. [Déborah Servili]
-- Merge pull request #14 from Delta-Sierra/master. [Alexandre Dulaunoy]
-
-  add function add filename
 - Add function add filename. [Déborah Servili]
 - Type-category association checking automated. [Déborah Servili]
-- Merge pull request #13 from Delta-Sierra/master. [Alexandre Dulaunoy]
-
-  removing some unnecessary checks
 - Removing some unnecessary checks. [Déborah Servili]
-- Merge https://github.com/MISP/PyMISP. [Déborah Servili]
-- Merge pull request #12 from Delta-Sierra/master. [Alexandre Dulaunoy]
-
-  type-category association checking automated
 - Type-category association checking automated. [Déborah Servili]
-- Merge pull request #10 from TheDr1ver/patch-1. [Alexandre Dulaunoy]
-
-  Add SSDEEP and FILENAME|SSDEEP support
 - Add SSDEEP and FILENAME|SSDEEP support. [Nick Driver]
-- Merge pull request #11 from TheDr1ver/patch-2. [Alexandre Dulaunoy]
-
-  Add internal reference attributes
 - Add internal reference attributes. [Nick Driver]
-- Merge pull request #9 from iglocska/master. [Alexandre Dulaunoy]
-
-  Added the option to filter out attributes based on distribution level
 - Added the option to filter out attributes based on distribution level.
   [Iglocska]
 - Type-category association checking automated. [Déborah Servili]
@@ -2397,11 +1869,7 @@ v2.4.36 (2016-04-15)
 - Added the option to filter out attributes based on distribution level.
   [Iglocska]
 - Correct module help. [Déborah Servili]
-- Merge pull request #34 from iglocska/master. [Alexandre Dulaunoy]
-
-  Capitalisation issues
 - Capitalisation issues. [Iglocska]
-- Merge remote-tracking branch 'circl/master' [Iglocska]
 - Ann missing categories in the authorized ones. [Raphaël Vinot]
 - Revert "Add upload_attachment" [Raphaël Vinot]
 
@@ -2413,17 +1881,8 @@ v2.4.36 (2016-04-15)
 - Use correct function to upload an attachment. [Raphaël Vinot]
 
   Fix #33
-- Merge pull request #32 from tomking2/master. [Alexandre Dulaunoy]
-
-  Search Event Index
 - Designed in same style as search, all attributes can be used. [=]
-- Merge remote-tracking branch 'upstream/master' [Thomas King]
-
-  Merging new pymisp changes
 - Fix pep8. [Raphaël Vinot]
-- Merge pull request #8 from truckydev/master. [Raphaël Vinot]
-
-  Add upload_attachment
 - Add upload_attachment. [Tristan METAYER]
 - Improve examples. [Raphaël Vinot]
 - Update version to 2.3. [Raphaël Vinot]
@@ -2431,50 +1890,24 @@ v2.4.36 (2016-04-15)
 - Python 2/3 compatible, urllib module. [Thomas King]
 - Added in searchable indexes, only brings back index and count etc, not
   results within the index. [Thomas King]
-- Merge pull request #7 from sebdraven/master. [Alexandre Dulaunoy]
-
-  add method change_threat_level
 - Add method change_threat_level. [Sébastien Larinier]
-- Merge pull request #31 from tomking2/Actor_Tag. [Alexandre Dulaunoy]
-
-  Add threat actor through API, Create new tag
 - Add threat actor through API, Create new tag. [Thomas King]
-- Merge pull request #6 from sebdraven/master. [Alexandre Dulaunoy]
-
-  add add_tag method to an event and value 5 to distribution attribute
 - Add add_tag method to an event and value 5 to distribution attribute.
   [Sébastien Larinier]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Alexandre Dulaunoy]
-- Merge pull request #5 from sebdraven/master. [Raphaël Vinot]
-
-  add method to export txt all attributes by type
 - Add method to export txt all attributes by type. [Sébastien Larinier]
-- Merge pull request #29 from cudeso/master. [Alexandre Dulaunoy]
-
-  Check if objectType exists in event
 - Check if objectType exists in event. [Koen Van Impe]
 
   Prevent failing when f.e. an event does not have a tag.
-- Merge pull request #4 from iglocska/master. [Alexandre Dulaunoy]
-
-  Updated the feed generator
 - Updated the feed generator. [Iglocska]
 
   - only save fields that are actually necessary and don't reveal too much of unneeded information (such as correlation)
   - add contextual fields to the manifest
 - Remove a small bug introduced by previous commit. [Alexandre Dulaunoy]
-- Merge branch 'master' of github.com:CIRCL/PyMISP. [Alexandre Dulaunoy]
-- Merge pull request #28 from deralexxx/master. [Alexandre Dulaunoy]
-
-  respect misp_verifycert in some tests
 - Update yara.py. [Alexander J]
 - Update upload.py. [Alexander J]
 - Update searchall.py. [Alexander J]
 - Update get.py. [Alexander J]
 - Update last.py. [Alexander J]
-- Merge pull request #3 from iglocska/master. [Alexandre Dulaunoy]
-
-  Script for the upcoming feed generator
 - Script for the upcoming feed generator. [Iglocska]
 
   - also some minor modifications to the get_index api
@@ -2482,37 +1915,23 @@ v2.4.36 (2016-04-15)
 - Initial Tags API. [Raphaël Vinot]
 - Normalize error messages. [Raphaël Vinot]
 - Add debug option. [Raphaël Vinot]
-- Merge branch 'master' of github.com:MISP/PyMISP. [Alexandre Dulaunoy]
-- Merge pull request #26 from urbanski/master. [Raphaël Vinot]
-
-  Fix KeyError when no results in time period
 - Fix KeyError when no results in time period. [Will Urbanski]
 
   Fix a KeyError when no results were found for the specified time period.
 - Threat level id is from 1 to 4 (not from 0 to 3) [Alexandre Dulaunoy]
 
   https://github.com/MISP/MISP/issues/729
-- Merge pull request #25 from iglocska/master. [Alexandre Dulaunoy]
-
-  reverted my previous commit that broke an assertion
 - Reverted my previous commit that broke an assertion. [iglocska]
-- Merge pull request #24 from iglocska/master. [Alexandre Dulaunoy]
-
-  Print the event so we can see what travis is trying to compare against
 - Print the event so we can see what travis is trying to compare
   against. [iglocska]
 
   - should help with the debugw
-- Merge pull request #23 from iglocska/master. [Alexandre Dulaunoy]
-
-  Should fix the test failures
 - Fixed an invalid assertion. [iglocska]
 
   - attribute count is None not u'0' when no attributes exist (should be fixed on MISP side in the long run)
 - Fixed a typo causing the tests to fail. [iglocska]
 - README updated including keys.py usage. [Alexandre Dulaunoy]
 - Authentication parameters updated. [Alexandre Dulaunoy]
-- Merge branch 'master' of github.com:CIRCL/PyMISP. [Alexandre Dulaunoy]
 - Auth parameters updated. [Alexandre Dulaunoy]
 - Updated auth parameters. [Alexandre Dulaunoy]
 - Normalized auth parameters. [Alexandre Dulaunoy]
@@ -2527,14 +1946,8 @@ v2.1.1 (2015-11-05)
 -------------------
 - Add add_ipsrc. [Raphaël Vinot]
 - Add basic support for the proposal API. [Raphaël Vinot]
-- Merge pull request #22 from grolinet/master. [Raphaël Vinot]
-
-  Helper methods added
 - Whitespace cleaned. [grolinet]
 - Helper methods added. [grolinet]
-- Merge pull request #21 from grolinet/master. [Raphaël Vinot]
-
-  Added missing types
 - Missing types added. [unknown]
 - Missing types added. [unknown]
 - Missing types added. [unknown]
@@ -2586,9 +1999,6 @@ v1.8.1 (2015-09-12)
 
   fix #16
 - Events id are integers not strings. [Alexandre Dulaunoy]
-- Merge pull request #15 from iglocska/master. [Alexandre Dulaunoy]
-
-  Dump the entire event including the 'Event' container element
 - Dump the entire event including the 'Event' container element.
   [iglocska]
 - Add test scripts to get and update an event. [Raphaël Vinot]
@@ -2604,10 +2014,6 @@ v1.8.1 (2015-09-12)
 v1.1.2 (2015-08-05)
 -------------------
 - Fix PyPi package. [Raphaël Vinot]
-- Merge branch 'master' of github.com:CIRCL/PyMISP. [Raphaël Vinot]
-- Merge pull request #14 from cudeso/master. [Alexandre Dulaunoy]
-
-  Add netflow filter output
 - Add netflow filter output. [Koen Van Impe]
 
   - get event data for event with “—event X”
@@ -2617,58 +2023,25 @@ v1.1.2 (2015-08-05)
 - Cleanup of the upload API. [Raphaël Vinot]
 - Preliminary version of the file uploader. [Raphaël Vinot]
 - Add test script to add attachement to event. [Raphaël Vinot]
-- Merge remote-tracking branch 'origin/master' [Raphaël Vinot]
-
-  Conflicts:
-  	examples/get_network_activity.py  (python 2.7 & 3 compatible print)
 - Bug fix: get_index now works properly and return the events index.
   [Alexandre Dulaunoy]
 
   An bug was introduced and appending "{}" to the /index url which
   gives a 404 on a MISP server.
-- Merge branch 'master' of https://github.com/CIRCL/PyMISP. [Alexandre
-  Dulaunoy]
-- Merge pull request #12 from iglocska/xml_json_fix. [Alexandre
-  Dulaunoy]
-
-  API made a bit more flexible with input data
 - API made a bit more flexible with input data. [Iglocska]
 
   - input for add_event() and update_event() can now be a JSON object, JSON string, XML
-- Merge branch 'master' of https://github.com/CIRCL/PyMISP. [Alexandre
-  Dulaunoy]
-- Merge pull request #11 from iglocska/xml_json_fix. [Alexandre
-  Dulaunoy]
-
-  Fix to an issue with using XML as input for add_event() and update_ev…
 - Fix to an issue with using XML as input for add_event() and
   update_event() [Iglocska]
 
   - also a change to the copy_list.py script to account for the change
-- Merge branch 'master' of https://github.com/CIRCL/PyMISP. [Alexandre
-  Dulaunoy]
-- Merge pull request #10 from Starow/master. [Raphaël Vinot]
-
-  Add 2 download functions of suricata rules events
 - Add 2 download functions of suricata rules events. [Debra Jules]
-- Merge pull request #8 from didelphodon/master. [Raphaël Vinot]
-
-  Update / Add need a JSON object as data
 - Update / Add need a JSON object as data. [didelphodon]
 
   ... furthermore content-type application was necessary otherwise MISP-REST API refuses to work as expected, at least with my installation.
-- Merge branch 'master' of github.com:CIRCL/PyMISP. [Alexandre Dulaunoy]
 - Make the code python3 friendly. [Raphaël Vinot]
-- Merge branch 'master' of github.com:CIRCL/PyMISP. [Alexandre Dulaunoy]
-- Merge pull request #1 from CIRCL/master. [Alexandre Dulaunoy]
-
-  More sample added - #1 pull import
 - Make PEP8 Happy. [Raphaël Vinot]
 - Use JSON POST to do the search. [Raphaël Vinot]
-- Merge branch 'master' of github.com:CIRCL/PyMISP. [Raphaël Vinot]
-- Merge pull request #1 from cudeso/master. [Alexandre Dulaunoy]
-
-  Example script to download MISP network activity
 - Example script to download MISP network activity. [Koen Van Impe]
 - Documentation reference added. [Alexandre Dulaunoy]
 - Add license. [Raphaël Vinot]
diff --git a/pymisp/__init__.py b/pymisp/__init__.py
index 512de05..6856d7d 100644
--- a/pymisp/__init__.py
+++ b/pymisp/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '2.4.102'
+__version__ = '2.4.103'
 import logging
 import functools
 import warnings