Merge branch 'newmaster' of https://github.com/kvetak/RINA.git into newmaster
Authored by: Marcel Marek 2015-02-02
Parent(s): [05b0e6][5739b7]
Child(ren): [256d0c]