Merge branch 'release' into development
Merge branch 'release' into development
Merge branch 'core-pr-3' into release
Merge branch 'release' into development
Merge branch 'core-pr-3' into release
Updated makefile to point to ding2tal
Merge branch 'release' into development
Merge branch 'core-pr-3' into release
Merge branch 'release' into development
Merge remote-tracking branch 'origin' into release
Merge branch 'release' into development
Moved sorting of reservation types into the module
Added support for getting only one type of reservations
Merge branch 'release' into development
Merge remote-tracking branch 'origin' into release
Merge branch 'core-pr-3' into development
Changed makefile to use development branch
Merge branch 'master' into release
Updated makefile to point to development branch and ding2tal
Merge branch 'release' into development