-----====== HDMU 12551 enigma2 Git 3031 ======-----
12551 2f157b4 santa, Sun Jul 20 21:57:39 2014 +0200: enable Volume/zaphistoryconfig in neutrino zapmode
12550 0b61a18 santa, Sun Jul 20 21:19:00 2014 +0200: add posibility to get back to standard at Info/EPG key
12549 7dc6085 santa, Sun Jul 20 00:07:16 2014 +0200: fix remotemenuentry
12548 042934f santa, Sat Jul 19 23:04:44 2014 +0200: use info for infobar, if ok is channellist and info is unused
12547 ecaa599 santa, Sat Jul 19 22:07:16 2014 +0200: merge pli
12546 4889eda santa, Sat Jul 19 21:04:03 2014 +0200: Merge remote-tracking branch 'plineu/master'
12545 df3ff2c Littlesat, Sat Jul 19 16:50:06 2014 +0200: Simplify the code around the renumbering of the services
12544 cc80f9e Littlesat, Sat Jul 19 16:35:36 2014 +0200: db.cpp: remove a not required line of code
12543 4f800a0 littlesat, Sat Jul 19 14:50:30 2014 +0200: ChannelSelection: always show pip and play in mainscreen in contextmenu
12542 73dff9f littlesat, Sat Jul 19 14:45:58 2014 +0200: ChannelSelection: cleanup some code - pure cosmetic
12541 47fb654 littlesat, Sat Jul 19 14:28:10 2014 +0200: ChannelSelection: more cleanups and add red key in context menu
12540 0aa2f3a littlesat, Sat Jul 19 13:34:31 2014 +0200: Channelselection: simplify some code around config in context menu
12539 2c86ab6 littlesat, Sat Jul 19 13:30:14 2014 +0200: Channelselection: Re-add parental control check pipzap/zap via context menu
12538 e8e9bfb bonkel, Fri Jul 18 19:35:36 2014 +0200: fix merge
12537 45103ba bonkel, Fri Jul 18 19:34:37 2014 +0200: fix merge
12536 b603d3a Littlesat, Fri Jul 18 18:49:40 2014 +0200: Also load userbouquets that are not in bouquets.tv or bouquets.radio
12535 194dd6c Littlesat, Fri Jul 18 18:18:12 2014 +0200: MoviePlayer: store last played movie in a config
12534 8e7b42c Littlesat, Fri Jul 18 17:48:56 2014 +0200: Channelselection: Add number icons in context menu
12533 a456c84 bonkel, Fri Jul 18 14:25:31 2014 +0200: Merge remote-tracking branch 'plineu/master'
12532 6955291 Littlesat, Fri Jul 18 11:27:10 2014 +0200: Remove parental control check PiPzap via Channelselection contect menu
12531 edfc3ab bonkel, Thu Jul 17 12:32:01 2014 +0200: fix