Merge branch 'dev' of https://github.com/grnet/flowspy into dev
authorStauros Kroustouris <staurosk@noc.grnet.gr>
Thu, 8 Jan 2015 14:45:54 +0000 (16:45 +0200)
committerStauros Kroustouris <staurosk@noc.grnet.gr>
Thu, 8 Jan 2015 14:45:54 +0000 (16:45 +0200)
commit42b861502b6011e4686a37d5425eecddf2de670c
tree9e0d13a04689a7e270f360723f6444ca8cdde966
parentb436bd510bf4e3e1c69f1c5b699d93171836b798
parent7ae0e0ec4604a3363386ec307eaad6002ed8bd8d
Merge branch 'dev' of https://github.com/grnet/flowspy into dev

Conflicts:
ChangeLog
_version.py
doc/index.md
flowspec/models.py
flowspec/views.py
flowspy/settings.py.dist
ChangeLog
doc/index.md
flowspec/models.py
flowspy/settings.py.dist