Commit Graph

364 Commits

Author SHA1 Message Date
Jacek Jendrzej
a25626adc1 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: b7ceb705a0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-26 (Tue, 26 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-09-26 12:52:04 +02:00
Stefan Seyfried
69391f8dd5 epgview: swap RC_info and RC_help in EPG view
this restores old behaviour of RC_info toggling big fonts.
RC_help toggles TMDB display (which is disabled by default anyway)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 940fdf36fd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-24 (Sun, 24 Sep 2017)



------------------
This commit was generated by Migit
2017-09-26 12:41:05 +02:00
Jacek Jendrzej
0d48f6627d Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ddad19873
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-21 (Wed, 21 Jun 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-21 13:54:49 +02:00
vanhofen
0449efa2d3 cc_frm_header: remove CComponentsHeaderLocalized() subclass
use another constructor of CComponentsHeader() instead

Signed-off-by: Thilo Graf <dbt@novatux.de>

Good idea, this I had already in mind too.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 980e293517
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)

Origin message was:
------------------
- cc_frm_header: remove CComponentsHeaderLocalized() subclass

use another constructor of CComponentsHeader() instead

Signed-off-by: Thilo Graf <dbt@novatux.de>

Good idea, this I had already in mind too.


------------------
This commit was generated by Migit
2017-06-21 10:31:22 +02:00
vanhofen
4b7badf315 cc_frm_header: remove CComponentsHeaderLocalized() subclass
use another constructor of CComponentsHeader() instead


Origin commit data
------------------
Branch: ni/coolstream
Commit: 92ceac6a5d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-20 (Tue, 20 Jun 2017)

Origin message was:
------------------
- cc_frm_header: remove CComponentsHeaderLocalized() subclass

use another constructor of CComponentsHeader() instead


------------------
This commit was generated by Migit
2017-06-20 15:55:42 +02:00
Jacek Jendrzej
88de018881 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: a70f3cb025
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-16 (Fri, 16 Jun 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-16 14:19:26 +02:00
vanhofen
992e1a6613 epgview: align with and height of progressbar
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4adea23661
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)

Origin message was:
------------------
- epgview: align with and height of progressbar

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-06-16 12:01:45 +02:00
vanhofen
98bed6910a epgview: align with and height of progressbar
Origin commit data
------------------
Branch: ni/coolstream
Commit: aec47e2ec9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)

Origin message was:
------------------
- epgview: align with and height of progressbar

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-16 11:10:31 +02:00
vanhofen
f1681b87be epgview: use CComponentsScrollbar
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4255640ce1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- epgview: use CComponentsScrollbar

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-06-15 21:52:18 +02:00
vanhofen
7a2931805e epgview: use CComponentsScrollbar
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5888627c8d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- epgview: use CComponentsScrollbar

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-06-15 16:18:25 +02:00
vanhofen
383bc8ee4f epgview: fix green button behavior in imdb-view
Origin commit data
------------------
Branch: ni/coolstream
Commit: 37846b7a2f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)

Origin message was:
------------------
- epgview: fix green button behavior in imdb-view

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-05-30 15:57:49 +02:00
vanhofen
63e69dfe48 icons: add rating-stars to icons.h; version 2.0
Origin commit data
------------------
Branch: ni/coolstream
Commit: 76928f97a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)

Origin message was:
------------------
- icons: add rating-stars to icons.h; version 2.0

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-05-29 16:30:39 +02:00
vanhofen
e369ab0e4c imdb: cosmetics
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4ef7333bf9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)

Origin message was:
------------------
- imdb: cosmetics

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-05-29 16:30:39 +02:00
vanhofen
b3f51a4d40 Revert "- icons: add rating-stars to icons.h to allow user's icons in ICONSDIR_VAR"
This reverts commit 321469e757.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 217a4ddd00
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)



------------------
This commit was generated by Migit
2017-05-29 15:05:31 +02:00
vanhofen
f716f8f0a8 Revert "- epgview: fix starbar/rating position"
This reverts commit 14561c0380.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5f9b70cb66
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)



------------------
This commit was generated by Migit
2017-05-29 15:05:08 +02:00
vanhofen
14561c0380 epgview: fix starbar/rating position
Origin commit data
------------------
Branch: ni/coolstream
Commit: c6e559559f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)

Origin message was:
------------------
- epgview: fix starbar/rating position

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-05-29 14:50:57 +02:00
gixxpunk
98b743ccc9 Merge branch 'ni/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 230b3dfe5e
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-29 (Mon, 29 May 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-05-29 14:01:08 +02:00
gixxpunk
8905f1ac11 imdb: enable explicit search on www.imdb.com
Origin commit data
------------------
Branch: ni/coolstream
Commit: 27ad3ad04a
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-29 (Mon, 29 May 2017)

Origin message was:
------------------
- imdb: enable explicit search on www.imdb.com

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-05-29 14:00:42 +02:00
vanhofen
321469e757 icons: add rating-stars to icons.h to allow user's icons in ICONSDIR_VAR
Origin commit data
------------------
Branch: ni/coolstream
Commit: abdf87c367
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)

Origin message was:
------------------
- icons: add rating-stars to icons.h to allow user's icons in ICONSDIR_VAR

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-05-29 13:22:13 +02:00
vanhofen
9926360aee imdb: localize output
Origin commit data
------------------
Branch: ni/coolstream
Commit: 47d920a3e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)

Origin message was:
------------------
- imdb: localize output

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-05-29 11:49:00 +02:00
vanhofen
04ec1ff0ca imdb: change getIMDbElement() handling; function now returns a string
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b5a851514
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)

Origin message was:
------------------
- imdb: change getIMDbElement() handling; function now returns a string

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-05-29 11:49:00 +02:00
vanhofen
4b57bc1ab6 epgview: use default header font; ...
now FONT_TYPE_EPG_TITLE is obsolete and can be removed


Origin commit data
------------------
Branch: ni/coolstream
Commit: deed324a98
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- epgview: use default header font; ...

now FONT_TYPE_EPG_TITLE is obsolete and can be removed


------------------
This commit was generated by Migit
2017-05-23 17:58:53 +02:00
vanhofen
0cbdcf9b97 epgview: bind display of channelogo to g_settings.channellist_show_channellogo
Origin commit data
------------------
Branch: ni/coolstream
Commit: c9015d7bbe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- epgview: bind display of channelogo to g_settings.channellist_show_channellogo

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-05-23 17:58:53 +02:00
vanhofen
fed7126cbc epgview: minor change in navibar's epg_date format
Origin commit data
------------------
Branch: ni/coolstream
Commit: dfd3cdb9a6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-07 (Sun, 07 May 2017)

Origin message was:
------------------
- epgview: minor change in navibar's epg_date format

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-05-07 21:48:16 +02:00
gixxpunk
d60bb70533 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4589862ad3
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-07 (Sun, 07 May 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-05-07 19:05:56 +02:00
Jacek Jendrzej
bcc9e29ffe Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: c926f1ea91
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-07 (Sun, 07 May 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-05-07 18:27:59 +02:00
Thilo Graf
378cf47ccd CEpgData: remove unused vars
Origin commit data
------------------
Branch: ni/coolstream
Commit: bbb04bfb20
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-06 (Sat, 06 May 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-05-06 22:46:18 +02:00
Jacek Jendrzej
34ad84d6b4 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 99fa83cb48
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-06 (Sat, 06 May 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-05-06 14:21:36 +02:00
Thilo Graf
c44c067b3a CEpgData/CEventList: use class CNaviBar for bottom box
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8f3fcc6060
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-05 (Fri, 05 May 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-05-06 00:02:30 +02:00
Jacek Jendrzej
9d8a618ef7 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b2f2afe01
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-05 (Fri, 05 May 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-05-05 13:27:14 +02:00
gixxpunk
e58b84de18 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 115c78404b
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-04 (Thu, 04 May 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-05-04 20:04:03 +02:00
Thilo Graf
fee507c813 CEpgData: supplement to 'fix header size'
commit: 7583714e6703a7ae9591e112726759c4070d0c68

Permanent font init is required to avoid possible crash after
changed font settings by user.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 17958da28f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-04 (Thu, 04 May 2017)



------------------
This commit was generated by Migit
2017-05-04 19:45:11 +02:00
Thilo Graf
328ba0b4eb CEpgData: fix header size
Header height was bound to font size in previous versions, but new
header is using other font as default, so we have wrong height,
therefore header items could paint outside of header. This should fix this.

In future we should unify header size with other windows.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 23912ba583
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-04 (Thu, 04 May 2017)



------------------
This commit was generated by Migit
2017-05-04 16:55:43 +02:00
vanhofen
43e622513a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp
	src/gui/epgview.cpp
	src/gui/epgview.h
	src/gui/eventlist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3210b958a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-03 (Wed, 03 May 2017)



------------------
This commit was generated by Migit
2017-05-03 22:57:24 +02:00
Thilo Graf
5dc6e6375f CEpgData: optimize handling of header and bottom box
Working with existant instances and reduce flicker effects.


Origin commit data
------------------
Branch: ni/coolstream
Commit: fc805049d3
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-03 (Wed, 03 May 2017)



------------------
This commit was generated by Migit
2017-05-03 21:29:41 +02:00
TangoCash
bb4fd66cae eventlist,epgview: add infoviewer bottom gradient style
Signed-off-by: Thilo Graf <dbt@novatux.de>
review required


Origin commit data
------------------
Branch: ni/coolstream
Commit: 54ce85c598
Author: TangoCash <eric@loxat.de>
Date: 2017-05-03 (Wed, 03 May 2017)

Origin message was:
------------------
-eventlist,epgview: add infoviewer bottom gradient style

Signed-off-by: Thilo Graf <dbt@novatux.de>
review required


------------------
This commit was generated by Migit
2017-05-03 21:29:41 +02:00
TangoCash
b86d0a7a09 epgview: fix movieinfo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5b0668cc23
Author: TangoCash <eric@loxat.de>
Date: 2017-05-03 (Wed, 03 May 2017)

Origin message was:
------------------
-epgview: fix movieinfo

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-05-03 21:29:41 +02:00
TangoCash
e36f7ccecd eventlist,epgview: adjust style, implement new header class
picked from:	https://github.com/TangoCash/neutrino-mp-cst-next
commit:	477db186ee4f306e191035ed2201ff4fc9d70b9d

Signed-off-by: Thilo Graf <dbt@novatux.de>
review reqiured


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ac2f99a67
Author: TangoCash <eric@loxat.de>
Date: 2017-05-03 (Wed, 03 May 2017)

Origin message was:
------------------
-eventlist,epgview: adjust style, implement new header class

picked from:	https://github.com/TangoCash/neutrino-mp-cst-next
commit:	477db186ee4f306e191035ed2201ff4fc9d70b9d

Signed-off-by: Thilo Graf <dbt@novatux.de>
review reqiured


------------------
This commit was generated by Migit
2017-05-03 21:29:41 +02:00
Jacek Jendrzej
229b0d7580 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: f292ba6b69
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-24 (Mon, 24 Apr 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-04-24 21:33:15 +02:00
vanhofen
3c5a9a5d88 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a34a8992d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-24 (Mon, 24 Apr 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-04-24 12:56:51 +02:00
vanhofen
a2cab1dffa scrollbars: avoid usage of COL_SCROLLBAR_PASSIVE_PLUS_0 ...
... outside of CComponentsScrollBar(). Since the color-changes in
cd80e26 the non-CC scrollbars looks weird.


Origin commit data
------------------
Branch: ni/coolstream
Commit: fe5f84c1d0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-24 (Mon, 24 Apr 2017)

Origin message was:
------------------
- scrollbars: avoid usage of COL_SCROLLBAR_PASSIVE_PLUS_0 ...

... outside of CComponentsScrollBar(). Since the color-changes in
cd80e26 the non-CC scrollbars looks weird.


------------------
This commit was generated by Migit
2017-04-24 12:29:52 +02:00
vanhofen
28376259c1 Merge branch 'master' into pu/mp
Conflicts:
	src/gui/epgplus.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 064f693bf7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)



------------------
This commit was generated by Migit
2017-04-08 14:36:12 +02:00
vanhofen
1606092aa6 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a0624cf4a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-04-08 14:32:18 +02:00
vanhofen
7294a68cfd epgview: move BIGFONT_FACTOR to settings.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: ddd803d8a3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- epgview: move BIGFONT_FACTOR to settings.h

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-04-08 14:11:27 +02:00
vanhofen
54d7d92401 Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/epgview.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: e61a23cb74
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)



------------------
This commit was generated by Migit
2017-02-08 08:02:39 +01:00
Stefan Seyfried
86f609bc17 replace fontrenderer.h include with forward declaration
in order to flatten the build dependency tree further, include
fontrenderer.h directly where needed, in header files a forward
declaration is enough


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2303d94300
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)



------------------
This commit was generated by Migit
2017-02-07 17:23:42 +01:00
Stefan Seyfried
7e25a8dace replace fontrenderer.h include with forward declaration
in order to flatten the build dependency tree further, include
fontrenderer.h directly where needed, in header files a forward
declaration is enough


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9082ddf287
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)



------------------
This commit was generated by Migit
2017-02-05 13:37:53 +01:00
Stefan Seyfried
776aea7c95 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: c6d7968381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-12-04 18:02:51 +01:00
vanhofen
a413bfb40d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/lua/lua_misc.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)



------------------
This commit was generated by Migit
2016-11-19 21:11:54 +01:00
Stefan Seyfried
d8d4d753a5 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c92d112d0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-12 18:06:26 +01:00