By rblanker: Added weight setting on ffmpeg tool installer.
By rblanker: Add workaround bug Drupal 7.23 for Simpletest; drupal_get_hash_salt() causes invalid HMAC calculation with wrong salt.
By rblanker: Number of fixes for tests that require the wmf test file instead of the default ogg.
By arjenk: Unittest small fix: use proper uri's.
By arjenk: Specific unittest needs other testfile.
By arjenk: Installation profile cleanup.
Version 3.5.x-dev build 2047.
By rblanker: Updated MediaMosa CK latest.
By arjenk: Upgraded module-filter to 1.8.
By arjenk: Upgraded Rubik theme to 4.0beta9.
By arjenk: Fixed typo during installation.
By arjenk: Upgraded libraries to 2.1.
By arjenk: Upgraded Rules to 7.x-2.5.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	profiles/mediamosa_profile/mediamosa_profile.profile