{"head":"21fbc5a5955d9418959802fb78d5cc541a51fb4b","size":2,"push_id":44879198,"shas":[["b8e8741531d531cff1330edc0f6bcdec3fcf3818","ae38d41980cecec9f9c7d5fed3fff65db16ae399@gmail.com","* FlylinkDC++ r501 beta41","Pavel Pimenov"],["21fbc5a5955d9418959802fb78d5cc541a51fb4b","ae38d41980cecec9f9c7d5fed3fff65db16ae399@gmail.com","Merge branch 'master' of github.com:pavel-pimenov/flylinkdc\n\nConflicts:\n\tMediaInfoLib/Source/MediaInfo/Multiple/File_Mpeg4.cpp\n\tchangelog-flylinkdc-r5xx-svn.txt\n\tclient/StringDefs.h\n\tcompiled/Lang/en-US.xml\n\tcompiled/Lang/ru-RU.xml\n\trevision.h\n\tversion.h\n\twindows/UPNPCheckDlg.cpp\n\twindows/UPNPCheckDlg.h\n\twindows/Wizards/WzNetActive.h","Pavel Pimenov"]],"ref":"refs/heads/master"}