#2078 Missing file type extension on combined css/js
Merge pull request #442 from DanielMuller/master

Add file extension to combined css/js links for better CDN caching
Automated update of .build_number to 426 for branch master
Last update: 69baeb145d9554a697a2af2de30f16efeb6dfa00 (1 commits ago)
[ci skip]
Move "item_moved" event later in the item update process.  Fixes #2077.
Before, this was before the children's caches were cleared, so if the
"item_moved" set an album cover, it would fail with an invalid path.  For the
same reason, we move it after the data file update, too.  Lastly, get we get
rid of duplicated code in item::move() since the "item_moved" event already
does this.
Merge pull request #448 from shadlaws/fix_2077_master

Move "item_moved" event later in the item update process.  Fixes #2077.
Automated update of .build_number to 427 for branch master
Last update: 188209446094b3521100d51587456053689080ce (1 commits ago)
[ci skip]
Remove extension from cache busters of non-combined JS/CSS links (follows 2078).
Merge pull request #450 from shadlaws/fixes_20130709_master

Remove extension from cache busters of non-combined JS/CSS links (follows 2078)
Automated update of .build_number to 428 for branch master
Last update: b8899a3f79a191c44e651a81b5a1976fb9d46db9 (1 commits ago)
[ci skip]
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.build_number