Merge remote-tracking branch 'origin' into release
Merge remote-tracking branch 'origin' into release
Merge remote-tracking branch 'origin' into release
Updated makefile to point to tag 7.x-1.0-beta2
Merge remote-tracking branch 'origin' into release
Merge remote-tracking branch 'origin' into release
Updated makefile to point to tag 7.x-1.0-beta3
Merge remote-tracking branch 'origin' into release
Updated makefile to point to tag 7.x-1.0-beta4
Merge remote-tracking branch 'origin' into release
Updated makefile to point to tag 7.x-1.0-beta5
Merge remote-tracking branch 'origin' into release
Updated makefile to point to tag 7.x-1.0-rc1
Updated makefile to point to tag 7.x-1.0-rc2
Merge remote-tracking branch 'origin' into release
Updated makefile to point to tag 7.x-1.0-rc3
Updated makefile to point to ding2 master branches
Added comment about media version in makefile
Merge pull request #5 from ding2tal/core-pr-4

Core pr 4
Merge branch 'master' into development