]> git.ipfire.org Git - thirdparty/tvheadend.git/log
thirdparty/tvheadend.git
11 years agoutil cron: re-added code I wrote in early EPG days for handling cron tasks
Adam Sutton [Sun, 20 Apr 2014 13:12:53 +0000 (14:12 +0100)] 
util cron: re-added code I wrote in early EPG days for handling cron tasks

This will be used as a means of managing mux subscription scheduling.

11 years agocapmt: fix invalid use of free()'d data as spotted by EricV
Adam Sutton [Thu, 17 Apr 2014 16:49:12 +0000 (17:49 +0100)] 
capmt: fix invalid use of free()'d data as spotted by EricV

11 years agobundle: fix memory leak spotted by EricV
Adam Sutton [Thu, 17 Apr 2014 16:35:30 +0000 (17:35 +0100)] 
bundle: fix memory leak spotted by EricV

11 years agotimeshift: reduce the output buffer size
Adam Sutton [Wed, 16 Apr 2014 21:32:54 +0000 (22:32 +0100)] 
timeshift: reduce the output buffer size

This will help with a potential overflow in the HTSP buffers that causes
glitches in client playback.

11 years agoui status: add CC and TE display
Adam Sutton [Wed, 16 Apr 2014 20:13:12 +0000 (21:13 +0100)] 
ui status: add CC and TE display

11 years agompegts: added some additional mux statistics
Adam Sutton [Wed, 16 Apr 2014 19:44:55 +0000 (20:44 +0100)] 
mpegts: added some additional mux statistics

11 years agowrappers: move thread start message to trace
Adam Sutton [Wed, 16 Apr 2014 19:31:58 +0000 (20:31 +0100)] 
wrappers: move thread start message to trace

11 years agoAdd support for seca3 emm (card updates) used by canal-digitaal nl and tv-vlaanderen 376/head
Glenn [Wed, 16 Apr 2014 19:15:28 +0000 (21:15 +0200)] 
Add support for seca3 emm (card updates) used by canal-digitaal nl and tv-vlaanderen

11 years agompegts: ignore NUL packets early
Adam Sutton [Wed, 16 Apr 2014 18:51:36 +0000 (19:51 +0100)] 
mpegts: ignore NUL packets early

11 years agompegts tsfile: fix PCR extraction for tsfile playback
Adam Sutton [Wed, 16 Apr 2014 18:49:28 +0000 (19:49 +0100)] 
mpegts tsfile: fix PCR extraction for tsfile playback

11 years agompegts: fix misuse of protected structure, can result in crash
Adam Sutton [Wed, 16 Apr 2014 09:44:27 +0000 (10:44 +0100)] 
mpegts: fix misuse of protected structure, can result in crash

11 years agoImprove the mux create routine to handle the unset and auto values 375/head
Jaroslav Kysela [Wed, 16 Apr 2014 08:28:18 +0000 (10:28 +0200)] 
Improve the mux create routine to handle the unset and auto values

11 years agotsfile: removed config saving and redundant file
Adam Sutton [Tue, 15 Apr 2014 21:31:57 +0000 (22:31 +0100)] 
tsfile: removed config saving and redundant file

11 years agoRevert "mpegts: disable the extra input thread"
Adam Sutton [Tue, 15 Apr 2014 08:21:56 +0000 (09:21 +0100)] 
Revert "mpegts: disable the extra input thread"

This reverts commit f8e48bdc3999c852ce4235f76c03313f6aa80102.

11 years agompegts: fix memleak on tune
Adam Sutton [Mon, 14 Apr 2014 22:46:36 +0000 (23:46 +0100)] 
mpegts: fix memleak on tune

11 years agoFix mkv generation by enhancing avc_find_start_code and thus correctly generating... 374/head
Eric Valette [Mon, 14 Apr 2014 22:10:15 +0000 (00:10 +0200)] 
Fix mkv generation by enhancing avc_find_start_code and thus correctly generating isom/fourcc

11 years agolinuxdvb: ensure that the enabled flag is properly honoured
Adam Sutton [Mon, 14 Apr 2014 20:29:56 +0000 (21:29 +0100)] 
linuxdvb: ensure that the enabled flag is properly honoured

11 years agompegts: fix for PCR extraction (used by tsfile)
Adam Sutton [Mon, 14 Apr 2014 16:49:18 +0000 (17:49 +0100)] 
mpegts: fix for PCR extraction (used by tsfile)

11 years agompegts: some minor corrections to MPEG-TS packet processing
Adam Sutton [Mon, 14 Apr 2014 16:48:31 +0000 (17:48 +0100)] 
mpegts: some minor corrections to MPEG-TS packet processing

Relates to #1986

11 years agompegts: disable the extra input thread
Adam Sutton [Mon, 14 Apr 2014 16:31:14 +0000 (17:31 +0100)] 
mpegts: disable the extra input thread

I have decided that this is no longer necessary, however:
a) I like some of the changes introduced, so want to keep them
b) want to keep the option available should I re-evaulate the performance

11 years agolinuxdvb: fix file processing to ensure data is passed and efficiently
Adam Sutton [Fri, 11 Apr 2014 23:11:38 +0000 (00:11 +0100)] 
linuxdvb: fix file processing to ensure data is passed and efficiently

11 years agompegts: fix TS packet processing that could lead to lost data
Adam Sutton [Fri, 11 Apr 2014 23:11:23 +0000 (00:11 +0100)] 
mpegts: fix TS packet processing that could lead to lost data

11 years agomain: added tsfile_done() call
Adam Sutton [Fri, 11 Apr 2014 22:47:55 +0000 (23:47 +0100)] 
main: added tsfile_done() call

11 years agosubscription: update to changes in mpegts_input API
Adam Sutton [Fri, 11 Apr 2014 22:47:05 +0000 (23:47 +0100)] 
subscription: update to changes in mpegts_input API

Really this should not be directly in here, as subscription code shouldn't
need any knowledge of the underlying systems. However its a backdoor into
the full mux.

11 years agotsfile: updated to use new mpegts_input API
Adam Sutton [Fri, 11 Apr 2014 22:46:38 +0000 (23:46 +0100)] 
tsfile: updated to use new mpegts_input API

11 years agoiptv: update to use new mpegts_input API
Adam Sutton [Fri, 11 Apr 2014 22:46:16 +0000 (23:46 +0100)] 
iptv: update to use new mpegts_input API

11 years agolinuxdvb: upated frontend code to use new mpegts_input API
Adam Sutton [Fri, 11 Apr 2014 22:45:42 +0000 (23:45 +0100)] 
linuxdvb: upated frontend code to use new mpegts_input API

11 years agompegts: reworking of the input threading
Adam Sutton [Fri, 11 Apr 2014 22:43:12 +0000 (23:43 +0100)] 
mpegts: reworking of the input threading

I have split the input threading in two. There is now a smaller/faster thread
responisble for reading data from the source device (file/socket/DVB/etc...)
and a potentially slower (though not too slow!) thread for processing.

This ensures that any minor delay in processing (potentially due to unexpected
effects during start/stop, or anything else!) do not unduly impact reading from
the source which could otherwise lead to loss of data.

11 years agompegts: ensure scrambled streams are properly handled
Adam Sutton [Mon, 14 Apr 2014 15:58:00 +0000 (16:58 +0100)] 
mpegts: ensure scrambled streams are properly handled

If a scrambled has been seen on a "scrambled" channel all further packets
(within the subscription) MUST be processed through the descrambler else we
can end up with out of sequence packets causing CC errors. Relates to #1986

11 years agoutil: added sbuf_read() to allow reading from FD straight into sbuf
Adam Sutton [Thu, 10 Apr 2014 19:12:25 +0000 (20:12 +0100)] 
util: added sbuf_read() to allow reading from FD straight into sbuf

11 years agohttp: possible NULL ptr on shutdown
Adam Sutton [Fri, 11 Apr 2014 16:25:30 +0000 (17:25 +0100)] 
http: possible NULL ptr on shutdown

11 years agoconfig: use local strdupa() routine for cross-platform compat.
Adam Sutton [Mon, 14 Apr 2014 15:56:41 +0000 (16:56 +0100)] 
config: use local strdupa() routine for cross-platform compat.

Spotted by decke

11 years agoutil: fix typo if #ifndef protection, spotted by decke
Adam Sutton [Mon, 14 Apr 2014 10:28:38 +0000 (11:28 +0100)] 
util: fix typo if #ifndef protection, spotted by decke

11 years agosettings: return NULL if no settings path is set
Adam Sutton [Sun, 13 Apr 2014 19:41:46 +0000 (20:41 +0100)] 
settings: return NULL if no settings path is set

11 years agolinuxdvb: fix typo in field name
Adam Sutton [Sun, 13 Apr 2014 19:31:49 +0000 (20:31 +0100)] 
linuxdvb: fix typo in field name

11 years agocwc: don't give up on decode attempts (fixes #1844)
Adam Sutton [Sun, 13 Apr 2014 19:24:17 +0000 (20:24 +0100)] 
cwc: don't give up on decode attempts (fixes #1844)

11 years agolinuxdvb: fix version for device enumeration support (fixes #2054)
Adam Sutton [Sun, 13 Apr 2014 14:37:09 +0000 (15:37 +0100)] 
linuxdvb: fix version for device enumeration support (fixes #2054)

11 years agoFix the uninitialized variable access detected by valgrind 370/head
Jaroslav Kysela [Wed, 9 Apr 2014 20:47:25 +0000 (22:47 +0200)] 
Fix the uninitialized variable access detected by valgrind

- in linuxdvb the structure member alignment causes these complaints
- in FFdecsa - probably the batch processing is the culprit

11 years agolinuxdvb: fix compilation on pre DVB API v5.10
Adam Sutton [Wed, 9 Apr 2014 20:37:12 +0000 (21:37 +0100)] 
linuxdvb: fix compilation on pre DVB API v5.10

11 years agolinuxdvb: correct mistake in delsys enumeration caused by recent updates
Adam Sutton [Wed, 9 Apr 2014 20:30:02 +0000 (21:30 +0100)] 
linuxdvb: correct mistake in delsys enumeration caused by recent updates

11 years agolinuxdvb: some slight tweaks to naming of translation routines
Adam Sutton [Wed, 9 Apr 2014 20:28:56 +0000 (21:28 +0100)] 
linuxdvb: some slight tweaks to naming of translation routines

Also publicly exposed one translation routine as its required in the adapter
setup

11 years agodvb: fix bug causing mux FE type from being overwritten
Adam Sutton [Tue, 8 Apr 2014 22:52:16 +0000 (23:52 +0100)] 
dvb: fix bug causing mux FE type from being overwritten

11 years agodvr: fix stupid compilation mistake (fixes #2038)
Adam Sutton [Tue, 8 Apr 2014 07:09:18 +0000 (08:09 +0100)] 
dvr: fix stupid compilation mistake (fixes #2038)

11 years agodvr: ensure update to in-progress recording doesn't restart (fixes #1982)
Adam Sutton [Mon, 7 Apr 2014 20:35:40 +0000 (21:35 +0100)] 
dvr: ensure update to in-progress recording doesn't restart (fixes #1982)

11 years agotimeshift: ensure no use of potentially free()'d variable (fixes #2028)
Adam Sutton [Mon, 7 Apr 2014 19:47:50 +0000 (20:47 +0100)] 
timeshift: ensure no use of potentially free()'d variable (fixes #2028)

11 years agourl: fix stupid mistakes in regexp (fixes #2021)
Adam Sutton [Mon, 7 Apr 2014 16:35:47 +0000 (17:35 +0100)] 
url: fix stupid mistakes in regexp (fixes #2021)

11 years agompegts dvb: fix rather dubious assert (fixes #2036)
Adam Sutton [Mon, 7 Apr 2014 16:02:28 +0000 (17:02 +0100)] 
mpegts dvb: fix rather dubious assert (fixes #2036)

Could have ensure this was set correctly on input, but given that it was being
set if no config was passed and almost certainly it must by definition be the
same as the source mux, might as well simplify things.

11 years agowebui: ensure we don't pass NULL to muxer_create for config (fixes #2017).
Adam Sutton [Mon, 7 Apr 2014 15:50:41 +0000 (16:50 +0100)] 
webui: ensure we don't pass NULL to muxer_create for config (fixes #2017).

11 years agoconfig: fix problems with config migration (fixes #2035, #2023)
Adam Sutton [Mon, 7 Apr 2014 15:36:53 +0000 (16:36 +0100)] 
config: fix problems with config migration (fixes #2035, #2023)

11 years agosettings: ensure config path is absolute
Adam Sutton [Mon, 7 Apr 2014 09:23:05 +0000 (10:23 +0100)] 
settings: ensure config path is absolute

I have a feeling using -D would break this due to the change to cwd?

11 years agoAdded checks to switch so will check if that switch is used before sending the commands 367/head
Gary The Brown [Mon, 7 Apr 2014 03:00:12 +0000 (04:00 +0100)] 
Added checks to switch so will check if that switch is used before sending the commands

11 years agoFinal fix for user permissions (file/directory) on recordings. I hope!
Ian [Fri, 4 Apr 2014 16:57:49 +0000 (17:57 +0100)] 
Final fix for user permissions (file/directory) on recordings. I hope!

11 years agolinuxdvb: fix stupid mistake in adapter config processing
Adam Sutton [Fri, 4 Apr 2014 16:24:48 +0000 (17:24 +0100)] 
linuxdvb: fix stupid mistake in adapter config processing

11 years agoRework on the addition of user options for file/dir permissions
Ian [Fri, 4 Apr 2014 15:46:56 +0000 (16:46 +0100)] 
Rework on the addition of user options for file/dir permissions
Note that this will not work without the intervention of someone who actually knows what they're doing ;-)

11 years agodvb: remove the inline config migration, this is handled in config.c now
Adam Sutton [Fri, 4 Apr 2014 15:17:56 +0000 (16:17 +0100)] 
dvb: remove the inline config migration, this is handled in config.c now

11 years agoMerge remote-tracking branch 'origin/pr/345'
Adam Sutton [Fri, 4 Apr 2014 14:56:13 +0000 (15:56 +0100)] 
Merge remote-tracking branch 'origin/pr/345'

11 years agoMerge remote-tracking branch 'origin/pr/356'
Adam Sutton [Fri, 4 Apr 2014 14:55:44 +0000 (15:55 +0100)] 
Merge remote-tracking branch 'origin/pr/356'

11 years agoMerge remote-tracking branch 'origin/pr/358'
Adam Sutton [Fri, 4 Apr 2014 14:55:37 +0000 (15:55 +0100)] 
Merge remote-tracking branch 'origin/pr/358'

11 years agoMerge remote-tracking branch 'origin/pr/359'
Adam Sutton [Fri, 4 Apr 2014 14:55:26 +0000 (15:55 +0100)] 
Merge remote-tracking branch 'origin/pr/359'

11 years agoMerge remote-tracking branch 'origin/pr/360'
Adam Sutton [Fri, 4 Apr 2014 14:50:28 +0000 (15:50 +0100)] 
Merge remote-tracking branch 'origin/pr/360'

11 years agoMerge remote-tracking branch 'origin/pr/361'
Adam Sutton [Fri, 4 Apr 2014 14:36:35 +0000 (15:36 +0100)] 
Merge remote-tracking branch 'origin/pr/361'

11 years agoconfig: update to include migration of the dvb networks folder
Adam Sutton [Fri, 4 Apr 2014 14:31:49 +0000 (15:31 +0100)] 
config: update to include migration of the dvb networks folder

11 years agoMerge branch 'feature/pr/365'
Adam Sutton [Fri, 4 Apr 2014 14:22:14 +0000 (15:22 +0100)] 
Merge branch 'feature/pr/365'

11 years agoMerge remote-tracking branch 'origin/pr/365'
Adam Sutton [Fri, 4 Apr 2014 14:02:21 +0000 (15:02 +0100)] 
Merge remote-tracking branch 'origin/pr/365'

11 years agoconfig: added migration of EPG and DVR entries
Adam Sutton [Fri, 4 Apr 2014 12:15:00 +0000 (13:15 +0100)] 
config: added migration of EPG and DVR entries

11 years agoconfig: migration of DVB networks
Adam Sutton [Fri, 4 Apr 2014 10:50:43 +0000 (11:50 +0100)] 
config: migration of DVB networks

This will not attempt to remove duplicate networks or configure the tuners.
I have decided this is just too much work to get right, versus very little
human input to correct.

11 years agoconfig: initial work on internal migration
Adam Sutton [Fri, 4 Apr 2014 08:54:36 +0000 (09:54 +0100)] 
config: initial work on internal migration

11 years agoconfig: started to add the concept of a configuration version
Adam Sutton [Thu, 3 Apr 2014 21:02:00 +0000 (22:02 +0100)] 
config: started to add the concept of a configuration version

This is to allow simple detection of a need to migrate, so that it can be done
in one centralised location. Rather than having to have lots of in place dual
config handling.

Some simple stuff will probably continue to be done in place, to avoid
constantly adding migration routines for trivial stuff. But anyting non-trivial
will at least be more easily handled without the need for external scripts.

11 years agoidnode uuid: move uuid routines to sep. file so it can be used more generally
Adam Sutton [Thu, 3 Apr 2014 20:50:55 +0000 (21:50 +0100)] 
idnode uuid: move uuid routines to sep. file so it can be used more generally

11 years agoqueue: mod to TAILQ_MOVE to ensure empty Q is properly copied/init
Adam Sutton [Fri, 4 Apr 2014 08:52:16 +0000 (09:52 +0100)] 
queue: mod to TAILQ_MOVE to ensure empty Q is properly copied/init

This mirrors a change that Andreas had already made in the showtime copy.

11 years agolinuxdvb: fix DVB API version mistakes
Adam Sutton [Wed, 2 Apr 2014 14:53:57 +0000 (15:53 +0100)] 
linuxdvb: fix DVB API version mistakes

11 years agoMove the linuxdvb mux code to the shared mpegts network code 365/head
Jaroslav Kysela [Mon, 31 Mar 2014 17:52:36 +0000 (19:52 +0200)] 
Move the linuxdvb mux code to the shared mpegts network code

... introduce $CFG/input/dvb/networks/... structure

11 years agoMove the linuxdvb network code to the shared mpegts network code
Jaroslav Kysela [Sun, 30 Mar 2014 19:46:43 +0000 (21:46 +0200)] 
Move the linuxdvb network code to the shared mpegts network code

... introduce $CFG/input/dvb/networks/... structure

11 years agoMove the linuxdvb service code to the shared mpegts service code
Jaroslav Kysela [Thu, 27 Mar 2014 11:23:18 +0000 (12:23 +0100)] 
Move the linuxdvb service code to the shared mpegts service code

... introduce $CFG/input/dvb/networks/... structure

11 years agolinuxdvb: remove the satconf mpegts_input_t proxy to cleanup input handlers
Jaroslav Kysela [Sat, 29 Mar 2014 20:18:52 +0000 (21:18 +0100)] 
linuxdvb: remove the satconf mpegts_input_t proxy to cleanup input handlers

11 years agoDo not rely on linux kernel's headers - preparing for network tuners (SAT-IP) 363/head
Jaroslav Kysela [Thu, 27 Mar 2014 10:27:17 +0000 (11:27 +0100)] 
Do not rely on linux kernel's headers - preparing for network tuners (SAT-IP)

This is a complete migration to use the own mux configuration scheme without
the system limitations to allow write backends for the network tuners like
SAT-IP servers.

11 years agoFurther refactor of dvr config page and options; addition of user options for file...
Ian [Sun, 30 Mar 2014 10:33:34 +0000 (11:33 +0100)] 
Further refactor of dvr config page and options; addition of user options for file and directory permissions throughout.

11 years agoRefactor of dvr config page and options; addition of user options for file and direct...
Ian [Thu, 27 Mar 2014 11:22:32 +0000 (11:22 +0000)] 
Refactor of dvr config page and options; addition of user options for file and directory permissions throughout.

11 years agoWait also for the active TCP threads on shutdown 361/head
Jaroslav Kysela [Mon, 24 Mar 2014 13:39:54 +0000 (14:39 +0100)] 
Wait also for the active TCP threads on shutdown

11 years agoFix the missing thread join calls for tcp servers
Jaroslav Kysela [Sun, 23 Mar 2014 10:01:49 +0000 (11:01 +0100)] 
Fix the missing thread join calls for tcp servers

This is a "hidden" memory leak, because the allocated stack pages are
not freed.

11 years agoFix linkage error with --disable-cwc 360/head
Glandos [Sat, 22 Mar 2014 19:39:20 +0000 (20:39 +0100)] 
Fix linkage error with --disable-cwc

11 years agomuxer dvr: fix configuration passing to reduce potential for error
Adam Sutton [Fri, 21 Mar 2014 14:56:46 +0000 (14:56 +0000)] 
muxer dvr: fix configuration passing to reduce potential for error

This should fix #2015

11 years agourl: minor correction based on suggestion from MinGyoon
Adam Sutton [Fri, 21 Mar 2014 14:30:31 +0000 (14:30 +0000)] 
url: minor correction based on suggestion from MinGyoon

Fixes #2012

11 years agoiptv: fix service config saving
Adam Sutton [Fri, 21 Mar 2014 14:27:07 +0000 (14:27 +0000)] 
iptv: fix service config saving

Fixes #2013

11 years agowebui: add the field order feature (for grid) 359/head
Jaroslav Kysela [Fri, 21 Mar 2014 08:21:20 +0000 (09:21 +0100)] 
webui: add the field order feature (for grid)

11 years agoAn attempt to make the default columns widths in idnode grids better 358/head
Jaroslav Kysela [Wed, 19 Mar 2014 16:37:41 +0000 (17:37 +0100)] 
An attempt to make the default columns widths in idnode grids better

11 years agocwc.c: do not try to reconnect in the destroy state 356/head
Jaroslav Kysela [Wed, 19 Mar 2014 08:30:27 +0000 (09:30 +0100)] 
cwc.c: do not try to reconnect in the destroy state

11 years agoiptv: update to multi-network API and remove fixed IPTV network
Adam Sutton [Sun, 16 Mar 2014 13:15:05 +0000 (13:15 +0000)] 
iptv: update to multi-network API and remove fixed IPTV network

This has caused a few people confusion, maybe removing it will cause more!
I guess we'll see. However it does seem better to allow things to be created
like everything else.

11 years agoiptv: allow setting of default (single) service name in mux config
Adam Sutton [Fri, 14 Mar 2014 22:58:31 +0000 (22:58 +0000)] 
iptv: allow setting of default (single) service name in mux config

11 years agotsfile: update to new multi-network arrangment
Adam Sutton [Mon, 17 Mar 2014 23:47:25 +0000 (23:47 +0000)] 
tsfile: update to new multi-network arrangment

11 years agolinuxdvb: update to new multiple networks setup
Adam Sutton [Mon, 17 Mar 2014 23:44:25 +0000 (23:44 +0000)] 
linuxdvb: update to new multiple networks setup

11 years agompegts: make the mapping of network<->input N<->N
Adam Sutton [Mon, 17 Mar 2014 17:40:37 +0000 (17:40 +0000)] 
mpegts: make the mapping of network<->input N<->N

I've rejected doing this for ages, however there are real limitations with
not being able to do this. And I've specifically come across one while thinking
about how some IPTV changes would be handled.

This will probably result in a break to peoples config, I will try and mitigate
this.

11 years agowebui idnode: hack to overcome extjs display issue
Adam Sutton [Mon, 17 Mar 2014 23:48:15 +0000 (23:48 +0000)] 
webui idnode: hack to overcome extjs display issue

11 years agoidnode prop: make it possible for child classes to override parent props
Adam Sutton [Mon, 17 Mar 2014 23:43:45 +0000 (23:43 +0000)] 
idnode prop: make it possible for child classes to override parent props

11 years agomisc: fix a bunch of shutdown error messages that are irrelevant
Adam Sutton [Tue, 18 Mar 2014 09:54:30 +0000 (09:54 +0000)] 
misc: fix a bunch of shutdown error messages that are irrelevant

11 years agoMerge remote-tracking branch 'origin/pr/354'
Adam Sutton [Tue, 18 Mar 2014 21:45:39 +0000 (21:45 +0000)] 
Merge remote-tracking branch 'origin/pr/354'

11 years agoMerge remote-tracking branch 'origin/pr/353'
Adam Sutton [Tue, 18 Mar 2014 21:45:29 +0000 (21:45 +0000)] 
Merge remote-tracking branch 'origin/pr/353'

11 years agoMerge remote-tracking branch 'origin/pr/352'
Adam Sutton [Tue, 18 Mar 2014 21:45:18 +0000 (21:45 +0000)] 
Merge remote-tracking branch 'origin/pr/352'

11 years agoMerge remote-tracking branch 'origin/pr/351'
Adam Sutton [Tue, 18 Mar 2014 21:44:55 +0000 (21:44 +0000)] 
Merge remote-tracking branch 'origin/pr/351'

11 years agoMerge remote-tracking branch 'origin/pr/350'
Adam Sutton [Tue, 18 Mar 2014 21:44:35 +0000 (21:44 +0000)] 
Merge remote-tracking branch 'origin/pr/350'