{"shas":[["765c581fae884186bbed503f7a4c1ac21b1652e9","9150a2565c8716789f03c4f0b21d3105c76b23ab@xbmc.org","Merge branch 'master' of git://github.com/xbmc/xbmc into AE\n\nConflicts:\n\tXBMC-ATV2.xcodeproj/project.pbxproj\n\tXBMC-IOS.xcodeproj/project.pbxproj\n\tproject/VS2010Express/XBMC.vcxproj\n\tproject/VS2010Express/XBMC.vcxproj.filters\n\txbmc/Application.cpp\n\txbmc/cores/AudioRenderers/CoreAudioRenderer.cpp\n\txbmc/cores/AudioRenderers/CoreAudioRenderer.h\n\txbmc/cores/AudioRenderers/NullDirectSound.cpp\n\txbmc/osx/CoreAudio.cpp\n\txbmc/utils/MathUtils.h","Geoffrey McRae"]],"ref":"refs/heads/AE","size":1,"head":"765c581fae884186bbed503f7a4c1ac21b1652e9","push_id":36360423}