]> git.ipfire.org Git - thirdparty/tvheadend.git/log
thirdparty/tvheadend.git
12 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).

12 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)

12 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?

12 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

12 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!

12 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

12 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 ;-)

12 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

12 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'

12 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'

12 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'

12 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'

12 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'

12 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'

12 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

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

12 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'

12 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

12 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.

12 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

12 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.

12 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

12 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.

12 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

12 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

12 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

12 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

12 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

12 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.

12 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.

12 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.

12 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

12 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.

12 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

12 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

12 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

12 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

12 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)

12 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

12 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

12 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.

12 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

12 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

12 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

12 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.

12 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

12 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

12 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

12 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'

12 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'

12 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'

12 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'

12 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'

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

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

12 years agoMerge remote-tracking branch 'origin/pr/344'
Adam Sutton [Tue, 18 Mar 2014 21:40:52 +0000 (21:40 +0000)] 
Merge remote-tracking branch 'origin/pr/344'

12 years agoFix the sp_reject_filter logic 354/head
Jaroslav Kysela [Tue, 18 Mar 2014 16:50:54 +0000 (17:50 +0100)] 
Fix the sp_reject_filter logic

This patch fixes the optimization from the commit
"PID lookup, streaming pad filter and sbuf alloc optimizations".

12 years agoAdd missing fsmonitor_done() for undefined ENABLE_INOTIFY 353/head
Jaroslav Kysela [Mon, 17 Mar 2014 13:30:47 +0000 (14:30 +0100)] 
Add missing fsmonitor_done() for undefined ENABLE_INOTIFY

Reported-by: decke on irc
12 years agoChanged service_mapper_notify() origin==NULL behaviour 351/head
Jaroslav Kysela [Mon, 17 Mar 2014 09:37:27 +0000 (10:37 +0100)] 
Changed service_mapper_notify() origin==NULL behaviour

12 years agoObvious typo fixes 352/head
Jaroslav Kysela [Mon, 17 Mar 2014 09:32:47 +0000 (10:32 +0100)] 
Obvious typo fixes

12 years agoFix the service <-> channel mapping editor #3
Jaroslav Kysela [Mon, 17 Mar 2014 09:06:03 +0000 (10:06 +0100)] 
Fix the service <-> channel mapping editor #3

- introduce service_mapper_notify() and origin arguments to avoid mess
- fix the service_mapper_process()

12 years agoFix the service <-> channel mapping editor #2
Jaroslav Kysela [Mon, 17 Mar 2014 08:23:05 +0000 (09:23 +0100)] 
Fix the service <-> channel mapping editor #2

- the clients of the origin service entry should be also notified

12 years agoFix the service <-> channel mapping editor
Jaroslav Kysela [Sun, 16 Mar 2014 18:52:50 +0000 (19:52 +0100)] 
Fix the service <-> channel mapping editor

- the channel entry should be saved after unlink (not before)
- the service or channel entry should be notified about changes
  to keep the channel / service grids in sync

12 years agoRemove waiting subscriptions in subscription_done() 344/head
Jaroslav Kysela [Sat, 15 Mar 2014 22:35:30 +0000 (23:35 +0100)] 
Remove waiting subscriptions in subscription_done()

12 years agoFix variable initialization in psi_parse_pmt() 350/head
Jaroslav Kysela [Sat, 15 Mar 2014 21:22:26 +0000 (22:22 +0100)] 
Fix variable initialization in psi_parse_pmt()

12 years agoAnother fix for the dvb adapter settings save 349/head
Jaroslav Kysela [Sat, 15 Mar 2014 21:27:56 +0000 (22:27 +0100)] 
Another fix for the dvb adapter settings save

12 years agoDo not save the adapter settings on each probe (start)
Jaroslav Kysela [Sat, 15 Mar 2014 20:03:34 +0000 (21:03 +0100)] 
Do not save the adapter settings on each probe (start)

The 'conf = feconf = NULL' line should be at another place otherwise
the last condition is always true (and the configuration is always saved).

12 years agoFix the unitialized variable for the cache scheme (HTTP streaming) 347/head
Jaroslav Kysela [Sat, 15 Mar 2014 17:56:48 +0000 (18:56 +0100)] 
Fix the unitialized variable for the cache scheme (HTTP streaming)

12 years agoAdd cache scheme selection for DVR to reduce system resources
Jaroslav Kysela [Fri, 14 Mar 2014 22:25:36 +0000 (23:25 +0100)] 
Add cache scheme selection for DVR to reduce system resources

12 years agoservice_mapper: fixes problems with saves when updating from services tab
Adam Sutton [Fri, 14 Mar 2014 22:51:06 +0000 (22:51 +0000)] 
service_mapper: fixes problems with saves when updating from services tab

Fixes #1999

12 years agoMerge remote-tracking branch 'origin/pr/344'
Adam Sutton [Fri, 14 Mar 2014 22:28:38 +0000 (22:28 +0000)] 
Merge remote-tracking branch 'origin/pr/344'

12 years agoMerge remote-tracking branch 'origin/pr/343'
Adam Sutton [Fri, 14 Mar 2014 22:28:18 +0000 (22:28 +0000)] 
Merge remote-tracking branch 'origin/pr/343'

12 years agoPreserve the dvr entry when the program is terminated.. 345/head
Jaroslav Kysela [Fri, 14 Mar 2014 19:19:43 +0000 (20:19 +0100)] 
Preserve the dvr entry when the program is terminated..

... it may help to continue with the recording after new start

12 years agohtsp: fix NULL ptr username, do it properly this time!
Adam Sutton [Fri, 14 Mar 2014 20:23:40 +0000 (20:23 +0000)] 
htsp: fix NULL ptr username, do it properly this time!

12 years agoThe sbuf allocation cleanups 343/head
Jaroslav Kysela [Wed, 12 Mar 2014 16:05:59 +0000 (17:05 +0100)] 
The sbuf allocation cleanups

This is an attempt to fix the nonoptimal memory allocations. The old
code tries to allocate new chunks based on maximum packet value, but
the streams contain mostly short chunks. Also, in some cases, we know
the fixed sbuf size, so use it.

12 years agoFix the subscription_done() call
Jaroslav Kysela [Fri, 14 Mar 2014 19:07:38 +0000 (20:07 +0100)] 
Fix the subscription_done() call

The subscription_unsubscribe() must be called from the upper layer (like dvr).

12 years agoFix another leaks in htsp_server.c (_very_ _VERY_ _BAD_)
Jaroslav Kysela [Fri, 14 Mar 2014 17:19:44 +0000 (18:19 +0100)] 
Fix another leaks in htsp_server.c (_very_ _VERY_ _BAD_)

12 years agoFix some memory leaks in parse_avc.c and mkmux.c
Jaroslav Kysela [Fri, 14 Mar 2014 20:01:49 +0000 (21:01 +0100)] 
Fix some memory leaks in parse_avc.c and mkmux.c

12 years agohtsp: ensure that NULL isn't passed as usernmae to access routines
Adam Sutton [Fri, 14 Mar 2014 09:40:30 +0000 (09:40 +0000)] 
htsp: ensure that NULL isn't passed as usernmae to access routines

12 years agoMerge remote-tracking branch 'origin/pr/340'
Adam Sutton [Thu, 13 Mar 2014 20:54:24 +0000 (20:54 +0000)] 
Merge remote-tracking branch 'origin/pr/340'

12 years agoMerge remote-tracking branch 'origin/pr/339'
Adam Sutton [Thu, 13 Mar 2014 20:53:41 +0000 (20:53 +0000)] 
Merge remote-tracking branch 'origin/pr/339'

12 years agohtsp dvr access: some updates to PR #333, plugs a few holes in access checks
Adam Sutton [Thu, 13 Mar 2014 20:40:08 +0000 (20:40 +0000)] 
htsp dvr access: some updates to PR #333, plugs a few holes in access checks

12 years agoMerge remote-tracking branch 'origin/pr/333'
Adam Sutton [Mon, 10 Mar 2014 20:10:55 +0000 (20:10 +0000)] 
Merge remote-tracking branch 'origin/pr/333'

12 years agoFix some typos and compilation errors (TRACE disabled) 340/head
Jaroslav Kysela [Sun, 9 Mar 2014 17:59:12 +0000 (18:59 +0100)] 
Fix some typos and compilation errors (TRACE disabled)

12 years agowebui: add icons to channel management functions 339/head
Carlo Landmeter [Sat, 8 Mar 2014 11:13:35 +0000 (12:13 +0100)] 
webui: add icons to channel management functions

12 years agoMerge remote-tracking branch 'origin/pr/338'
Adam Sutton [Fri, 7 Mar 2014 20:44:39 +0000 (20:44 +0000)] 
Merge remote-tracking branch 'origin/pr/338'

12 years agopvr: change the directory permissions to more sane value
Adam Sutton [Fri, 7 Mar 2014 20:43:13 +0000 (20:43 +0000)] 
pvr: change the directory permissions to more sane value

This might need reviewing and making configurable, but this is definitely
a more sane starting point than the original.

12 years agoMerge remote-tracking branch 'origin/pr/337'
Adam Sutton [Fri, 7 Mar 2014 20:41:05 +0000 (20:41 +0000)] 
Merge remote-tracking branch 'origin/pr/337'

12 years agoJavascript: define default sort for some config grids
Jaroslav Kysela [Thu, 6 Mar 2014 14:04:14 +0000 (15:04 +0100)] 
Javascript: define default sort for some config grids

12 years agoSYS_DVBS can have other modulation, ex: PSK_8 which will not work without this fix
Dani Louca [Thu, 6 Mar 2014 04:16:51 +0000 (23:16 -0500)] 
SYS_DVBS can have other modulation, ex: PSK_8 which will not work without this fix

12 years agoRevert dynamic instances iptv_input and iptv_network
Andy Brown [Thu, 6 Mar 2014 15:05:37 +0000 (15:05 +0000)] 
Revert dynamic instances iptv_input and iptv_network

12 years agoUse inline functions for the PID lookup optimizations
Jaroslav Kysela [Thu, 6 Mar 2014 13:17:21 +0000 (14:17 +0100)] 
Use inline functions for the PID lookup optimizations

12 years agoOptimize mpegts_input_recv_packets()
Jaroslav Kysela [Thu, 6 Mar 2014 12:06:20 +0000 (13:06 +0100)] 
Optimize mpegts_input_recv_packets()

12 years agoChanged the PID lookup and other optimizations
Jaroslav Kysela [Thu, 6 Mar 2014 11:42:06 +0000 (12:42 +0100)] 
Changed the PID lookup and other optimizations

Followed the Adam's advice to remove _fast functions.

12 years agoPID lookup, streaming pad filter and sbuf alloc optimizations
Jaroslav Kysela [Wed, 5 Mar 2014 16:31:19 +0000 (17:31 +0100)] 
PID lookup, streaming pad filter and sbuf alloc optimizations

There is high probability (because of the "nature" of TS streams) that
next PID will match previous one. This patch tries to do simple "caching"
of last PID to speedup PID lookups.

The streaming pad filter is handled faster way now.

Also, sbuf allocations routines are optimized (better sb_size prediction and
allocation routine is called only on demand - not all time).

12 years agoAdd channel number management functions 338/head
BtbN [Thu, 6 Mar 2014 17:45:28 +0000 (18:45 +0100)] 
Add channel number management functions

12 years agoFix crash on startup
BtbN [Fri, 7 Mar 2014 18:31:23 +0000 (19:31 +0100)] 
Fix crash on startup

12 years agoadd option to only allow user to access the tag that matches username 333/head
amet [Fri, 7 Mar 2014 07:05:03 +0000 (11:05 +0400)] 
add option to only allow user to access the tag that matches username

12 years agoNeither stream nor file should require 0777 use 0644 instead, closes #1962. 337/head
Bernhard Schuster [Thu, 6 Mar 2014 22:06:15 +0000 (23:06 +0100)] 
Neither stream nor file should require 0777 use 0644 instead, closes #1962.

12 years agoMerge remote-tracking branch 'origin/pr/331'
Adam Sutton [Wed, 5 Mar 2014 16:22:18 +0000 (16:22 +0000)] 
Merge remote-tracking branch 'origin/pr/331'