Part of my 'no commit left behind' program, here's a list of the commits to other branches that may want to be merged forward to trunk.
| Commit | Branch | User | Summary | Status | |
| 974 | branches/ted09715 | ted_jofo | Temp fix ... translations on SF | Merged to core (998) as well as 0.972 (999) | |
| 975 | branches/ted09715 | ted_jofo | ted 09715 release info | merged in 981 | |
| 976 | branches/ted09715 | ted_jofo | ted 09715 changelog | merged in 997 | |
| 892 | branches/ted0972 | ted_jofo | Merged FS#281 to 0.972 branch | was merged from core | |
| 911 | branches/ted0972 | ted_jofo | FS#296: fixed the epguides parser. | no difference 0.972 with core (already merged?) | |
| 913 | branches/ted0972 | ted_jofo | FS#294: Merged first version of ratio option to 0.972 branch. | was merged from core | |
| 916 | branches/ted0972 | ted_jofo | FS#45: Merged "download to folder" to 0.972 branch. | was merged from core | |
| 918 | branches/ted0972 | ted_jofo | FS#300: merged fix to 0.972 branch. | was merged from core | |
| 940 | branches/ted0972 | ted_jofo | Pom fix 0.972 release | branch specific fix | |
| 941 | branches/ted0972 | ted_jofo | Save download to folder settings. | Fix is present on both branches (code is very different) | |
| 942 | branches/ted0972 | ted_jofo | Small 0.972 pom fix. | branch specific fix | |
| 943 | branches/ted0972 | ted_jofo | FS#304: Don't be able to edit predefined feeds | merged to core in 945 | |
| 944 | branches/ted0972 | ted_jofo | FS#303: Edit show didn't save user defined feeds on generate. | merged to core in 945 | |
| 946 | branches/ted0972 | ted_jofo | FS#294: added option to fill in torrent ratio. | merged to core in 1006 | |
| 947 | branches/ted0972 | ted_jofo | Cleaned up pom + removed runnable directory | Removed runnable directory (other change is branch specific) | |
| 961 | branches/ted0972 | ted_jofo | FS#225: Show (and use) the air time for show that air today, tomorrow or the day after tomorrow. | merged in 1009 | |
| 963 | branches/ted0972 | ted_jofo | FS#305: import/export fix. | merged in 962 | |
| 964 | branches/ted0972 | ted_jofo | Small scheduler fix | merged in 1009 | |
| 968 | branches/ted0972 | ted_jofo | FS#303: when changing show... | merged in 1010 | |
| 969 | branches/ted0972 | ted_jofo | FS#308: made a small adjustment... | was fixed in 972 | |
| 971 | branches/ted0972 | ted_jofo | Get TvRage time information. | ??? TedXmlParser is gone in core ??? | |
| 972 | branches/ted0972 | rulecam | GUI modification that fixes the large textbox... | merged in 1008 | |
| 993 | branches/ted0972 | rulecam | FS#311 - When schedule is updated | Can be done after 971 is done | |
| 994 | branches/ted0972 | rulecam | FS#314 - Read tvrage id from xml | branch specific change |
