Commit Graph

639 Commits

Author SHA1 Message Date
Luke Pulverenti
a660aa001e re-organize file streaming 2017-03-12 15:27:26 -04:00
Luke Pulverenti
79b28e2465 3.2.7.2 2017-03-10 13:34:07 -05:00
Luke Pulverenti
fb7c7c578d 3.2.7.1 2017-03-08 14:29:21 -05:00
Luke Pulverenti
77c387885d 3.2.6.2 2017-03-08 14:18:40 -05:00
Luke Pulverenti
9fa6868af3 update legacy hd homerun support 2017-03-07 13:27:56 -05:00
Luke Pulverenti
9e74d834a7 update legacy hdhomerun support 2017-03-05 21:32:56 -05:00
Luke Pulverenti
00fb471162 3.2.5.6 2017-03-05 10:38:54 -05:00
Luke Pulverenti
d68cdc0c6d 3.2.5.5 2017-03-03 01:38:05 -05:00
Luke Pulverenti
7cbc76af27 3.2.5.4 2017-03-03 00:53:21 -05:00
Luke Pulverenti
9f7ee6d34c 3.2.5.3 2017-03-02 14:05:59 -05:00
Luke Pulverenti
26c88e6ad6 3.2.5.2 2017-03-01 15:30:23 -05:00
Luke Pulverenti
5d094874e5 3.2.5.1 2017-02-26 16:48:21 -05:00
Luke Pulverenti
666604e8cb 3.2.4.1 2017-02-25 10:46:18 -05:00
Luke Pulverenti
868f0afc95 3.2.3.1 2017-02-24 15:07:26 -05:00
Luke Pulverenti
972ca5e449 3.2.2.1 2017-02-24 12:19:17 -05:00
Luke Pulverenti
592c1a7f24 3.2.1.116 2017-02-23 14:13:47 -05:00
Luke Pulverenti
34171a7507 if (string.IsNullOrWhiteSpace(result))
{
                attributes.TryGetValue("channel-id", out result);
            }
2017-02-22 16:13:27 -05:00
Luke Pulverenti
389d3f7629 3.2.1.114 2017-02-21 13:04:54 -05:00
Luke Pulverenti
45250b7874 3.2.1.113 2017-02-20 16:22:15 -05:00
Luke Pulverenti
e7ebc598c8 3.2.1.112 2017-02-20 15:52:31 -05:00
Luke Pulverenti
de3ca87a76 3.2.1.111 2017-02-20 02:08:57 -05:00
Luke Pulverenti
5d8fd7ce39 3.2.1.110 2017-02-18 23:17:50 -05:00
Luke Pulverenti
f52df8d612 3.2.1.109 2017-02-18 03:32:47 -05:00
Luke Pulverenti
b51f00feb6 3.2.1.108 2017-02-16 02:43:03 -05:00
Luke Pulverenti
db7e78640a improve series recording images 2017-02-15 16:19:07 -05:00
Luke Pulverenti
4677e92204 restore tv series alphabet picker 2017-02-14 16:11:06 -05:00
Luke Pulverenti
5508c388f5 3.2.1.105 2017-02-13 16:04:41 -05:00
Luke Pulverenti
511a8702c2 3.2.1.104 2017-02-12 20:17:13 -05:00
Luke Pulverenti
a0f4a628dd 3.2.1.103 2017-02-11 16:20:08 -05:00
Luke Pulverenti
825bb32d7b 3.2.1.102 2017-02-10 15:07:24 -05:00
Luke Pulverenti
4bc2a77df1 3.2.1.100 2017-02-09 19:15:50 -05:00
Luke Pulverenti
1879999fd3 3.2.0.104 2017-02-08 22:58:25 -05:00
Luke Pulverenti
d6b4b5eeb0 3.2.0.103 2017-02-08 16:31:19 -05:00
Luke Pulverenti
2fa03c19d4 3.2.0.102 2017-02-08 15:00:11 -05:00
Luke Pulverenti
64b5600528 3.2.0.101 2017-02-07 13:36:12 -05:00
Luke Pulverenti
4704d22944 version bump 2017-02-06 01:51:02 -05:00
Luke Pulverenti
7f7be26771 restore version 2016-12-20 15:00:04 -05:00
Luke Pulverenti
025905a3e4 fix merge conflict 2016-12-18 00:44:21 -05:00
Luke Pulverenti
54d5b71577 restore version 2016-12-18 00:43:53 -05:00
Luke Pulverenti
4853e795d7 fix merge conflict 2016-12-18 00:43:37 -05:00
Luke Pulverenti
9dfbaf461e 3.0.8500 2016-11-03 13:03:06 -04:00
Luke Pulverenti
7ace9d6535 3.0.8400 2016-10-30 14:44:42 -04:00
Luke Pulverenti
c0621fd701 3.0.8300 2016-10-20 15:30:20 -04:00
Luke Pulverenti
40255e6014 fix merge conflict 2016-10-20 15:27:27 -04:00
Luke Pulverenti
b90b64aae8 3.0.8200 2016-10-17 12:34:11 -04:00
Luke Pulverenti
f8a248ffd8 fix merge conflict 2016-10-17 12:32:48 -04:00
Luke Pulverenti
734d215940 3.0.8100 2016-10-13 17:20:36 -04:00
Luke Pulverenti
94ddbfd57f fix merge conflict 2016-10-13 17:19:38 -04:00
Luke Pulverenti
3aabe6aa19 3.0.8000 2016-10-12 15:44:06 -04:00
Luke Pulverenti
0677d4ec99 fix merge conflict 2016-10-12 15:43:19 -04:00
Luke Pulverenti
c25179473b 3.0.8000 2016-10-12 15:41:20 -04:00
Luke Pulverenti
54cf4cbb44 fix merge conflict 2016-10-12 15:40:19 -04:00
Luke Pulverenti
0b5a1418c1 3.0.7300 2016-10-01 00:15:51 -04:00
Luke Pulverenti
2ce3869fd2 3.0.7200 2016-09-17 00:25:24 -04:00
Luke Pulverenti
b06d70e882 3.0.7100 2016-09-10 02:12:55 -04:00
Luke Pulverenti
673b2b9979 3.0.7000 2016-09-09 16:23:08 -04:00
Luke Pulverenti
e821c38cd4 restore version 2016-09-09 15:44:40 -04:00
Luke Pulverenti
ecc1ac78bb fix merge conflict 2016-09-09 15:41:49 -04:00
Luke Pulverenti
5e7a79bc85 3.0.6400 2016-08-29 15:04:28 -04:00
Luke Pulverenti
cdf85f69cd restore version 2016-08-29 15:01:38 -04:00
Luke Pulverenti
416e175901 3.1.128 2016-08-29 14:44:19 -04:00
Luke Pulverenti
70234149eb 3.1.127 2016-08-28 15:45:53 -04:00
Luke Pulverenti
21a8dc77c3 fix merge conflict 2016-08-28 15:45:17 -04:00
Luke Pulverenti
3785298dd9 restore version 2016-08-28 12:26:37 -04:00
Luke Pulverenti
71b5433d99 3.0.6300 2016-08-27 15:56:34 -04:00
Luke Pulverenti
4d996a3cc9 restore version 2016-08-27 15:53:36 -04:00
Luke Pulverenti
9d762c3878 fix merge conflict 2016-08-27 15:47:12 -04:00
Luke Pulverenti
54886db5e5 3.0.6200 2016-08-25 17:48:59 -04:00
Luke Pulverenti
e2a06e51a3 3.0.6100 2016-08-25 14:47:41 -04:00
Luke Pulverenti
870c843194 fix merge conflict 2016-08-25 14:45:56 -04:00
Luke Pulverenti
c904bec20d 3.0.6070 2016-08-19 15:01:13 -04:00
Luke Pulverenti
8e88b569d8 restore version 2016-08-19 14:57:26 -04:00
Luke Pulverenti
e108e4f23a 3.1.114 2016-08-19 14:46:08 -04:00
Luke Pulverenti
df5450d0b6 3.1.113 2016-08-19 02:23:26 -04:00
Luke Pulverenti
a1a5446342 3.1.112 2016-08-18 13:35:52 -04:00
Luke Pulverenti
3162d71c45 3.1.111 2016-08-18 02:01:28 -04:00
Luke Pulverenti
6b47232b15 3.1.110 2016-08-17 16:53:12 -04:00
Luke Pulverenti
186c5f5085 3.1.109 2016-08-17 01:51:07 -04:00
Luke Pulverenti
c8299b4cee 3.1.108 2016-08-16 13:10:50 -04:00
Luke Pulverenti
65636721a1 3.1.107 2016-08-16 02:16:48 -04:00
Luke Pulverenti
352842c5d6 restore version 2016-08-16 01:55:03 -04:00
Luke Pulverenti
f66a25db1c fix merge conflict 2016-08-16 01:54:27 -04:00
Luke Pulverenti
42cbe62990 restore version 2016-08-16 00:11:02 -04:00
Luke Pulverenti
9a956f5e29 fix merge conflict 2016-08-16 00:10:14 -04:00
Luke Pulverenti
053ea1a6ba 3.1.106 2016-08-15 17:06:18 -04:00
Luke Pulverenti
a85de2984a 3.1.105 2016-08-14 17:59:34 -04:00
Luke Pulverenti
4a63f24ae7 3.1.104 2016-08-14 16:02:02 -04:00
Luke Pulverenti
a9e65b93cc 3.1.103 2016-08-14 02:29:49 -04:00
Luke Pulverenti
49255561fb 3.1.102 2016-08-13 16:58:44 -04:00
Luke Pulverenti
6600ff0990 3.1.101 2016-08-13 02:36:14 -04:00
Luke Pulverenti
3878da49a5 3.1.100 2016-08-12 15:32:58 -04:00
Luke Pulverenti
36542d3cc1 3.1.99 2016-08-11 18:43:31 -04:00
Luke Pulverenti
4dcd381701 3.1.98 2016-08-10 15:19:50 -04:00
Luke Pulverenti
bfdd9e8936 3.1.97 2016-08-09 01:13:23 -04:00
Luke Pulverenti
e652b996b6 3.1.96 2016-08-08 14:18:32 -04:00
Luke Pulverenti
2eeae1c550 3.1.95 2016-08-07 16:17:46 -04:00
Luke Pulverenti
dd013bf622 3.1.94 2016-08-07 02:40:05 -04:00
Luke Pulverenti
1640bcb289 3.1.93 2016-08-06 17:11:43 -04:00
Luke Pulverenti
a571ee38ce 3.1.92 2016-08-06 10:11:47 -04:00
Luke Pulverenti
7f0d4c7210 3.1.91 2016-08-06 00:50:24 -04:00
Luke Pulverenti
bfe746d4e0 3.1.90 2016-08-05 02:14:13 -04:00
Luke Pulverenti
8cca5dfb03 fix merge conflict 2016-08-05 02:13:19 -04:00
Luke Pulverenti
295d47a487 fix version 2016-08-04 01:03:05 -04:00
Luke Pulverenti
c7798fcd48 3.0.6030 2016-08-04 00:55:45 -04:00
Luke Pulverenti
0c3b7a33c2 fix merge conflict 2016-08-04 00:47:50 -04:00
Luke Pulverenti
4be3ee433b 3.0.6020 2016-07-29 12:01:11 -04:00
Luke Pulverenti
100236f416 fix merge conflict 2016-07-29 11:59:37 -04:00
Luke Pulverenti
7d52078470 3.0.6010 2016-07-27 15:33:53 -04:00
Luke Pulverenti
b3db8fdb0d fix merge conflict 2016-07-27 15:31:19 -04:00
Luke Pulverenti
677709f420 3.0.6000 2016-07-23 16:13:49 -04:00
Luke Pulverenti
d661f690f5 fix merge conflicts 2016-07-23 16:12:52 -04:00
Luke Pulverenti
f71e88f748 3.0.5991 2016-07-22 16:48:46 -04:00
Luke Pulverenti
821d673111 fix merge conflict 2016-07-22 16:47:35 -04:00
Luke Pulverenti
9012759769 3.0.5990 2016-07-22 01:59:21 -04:00
Luke Pulverenti
739ad6e1df 3.0.5986 2016-07-14 14:29:07 -04:00
Luke Pulverenti
7b58f3a89a 3.0.5985 2016-07-07 23:52:19 -04:00
Luke Pulverenti
598aeb1988 3.0.5984 2016-07-03 20:25:47 -04:00
Luke Pulverenti
ac62ba9e19 fix merge conflict 2016-07-03 20:24:41 -04:00
Luke Pulverenti
c0f43d9abc 3.0.5983 2016-07-02 17:51:24 -04:00
Luke Pulverenti
db99a9840b fix merge conflict 2016-07-02 17:50:58 -04:00
Luke Pulverenti
7a39ce558a 3.0.5981 2016-07-01 02:11:16 -04:00
Luke Pulverenti
05b0527894 fix merge conflict 2016-07-01 02:10:25 -04:00
Luke Pulverenti
0f7a26ecc1 3.0.5980 2016-06-30 15:32:29 -04:00
Luke Pulverenti
219c6464cd 3.1.48 2016-06-30 15:04:43 -04:00
Luke Pulverenti
a8b377d745 3.1.47 2016-06-30 01:07:22 -04:00
Luke Pulverenti
2480333a8d 3.1.46 2016-06-29 16:41:15 -04:00
Luke Pulverenti
4753f3f29b 3.1.45 2016-06-29 14:02:29 -04:00
Luke Pulverenti
1d6421dde9 3.1.44 2016-06-29 00:08:50 -04:00
Luke Pulverenti
56d7f729a0 3.1.43 2016-06-28 00:49:28 -04:00
Luke Pulverenti
73bc3ac4dc 3.1.42 2016-06-27 11:40:05 -04:00
Luke Pulverenti
021f10f6d9 3.1.41 2016-06-26 12:24:41 -04:00
Luke Pulverenti
a1ad61ff8d 3.1.40 2016-06-25 02:54:31 -04:00
Luke Pulverenti
2242a4f7b1 3.1.39 2016-06-24 16:43:11 -04:00
Luke Pulverenti
db2b37776e 3.1.38 2016-06-24 11:15:19 -04:00
Luke Pulverenti
5a658c244d 3.1.37 2016-06-23 13:07:25 -04:00
Luke Pulverenti
2eee5c8a15 3.1.36 2016-06-22 16:18:57 -04:00
Luke Pulverenti
0b61b5b679 3.1.35 2016-06-22 00:43:11 -04:00
Luke Pulverenti
e83102abde 3.1.34 2016-06-21 11:28:20 -04:00
Luke Pulverenti
dd00e5d5f2 3.1.33 2016-06-20 13:13:51 -04:00
Luke Pulverenti
7f7e083794 3.1.32 2016-06-20 13:12:15 -04:00
Luke Pulverenti
36d53b7ec0 3.1.31 2016-06-20 02:50:30 -04:00
Luke Pulverenti
d6b5adba5a 3.1.30 2016-06-19 13:42:44 -04:00
Luke Pulverenti
740d1bc8cf 3.1.29 2016-06-19 02:21:53 -04:00
Luke Pulverenti
0edd4e71fb 3.1.28 2016-06-18 13:30:13 -04:00
Luke Pulverenti
549a571d16 3.1.27 2016-06-17 20:54:46 -04:00
Luke Pulverenti
b8d8a95d6a 3.1.26 2016-06-17 09:25:37 -04:00
Luke Pulverenti
c807bb4d0e 3.1.25 2016-06-16 09:27:37 -04:00
Luke Pulverenti
bd5697625d 3.1.24 2016-06-15 14:59:47 -04:00
Luke Pulverenti
4beb41fea8 3.1.23 2016-06-15 12:49:47 -04:00
Luke Pulverenti
48bf454f09 3.1.22 2016-06-14 23:15:45 -04:00
Luke Pulverenti
51de0d3868 3.1.21 2016-06-14 15:24:13 -04:00
Luke Pulverenti
48a66372a5 3.1.20 2016-06-14 02:41:57 -04:00
Luke Pulverenti
ffeee2255f 3.1.19 2016-06-13 15:06:35 -04:00
Luke Pulverenti
7177c6e247 3.1.18 2016-06-12 19:36:41 -04:00
Luke Pulverenti
1ffd09b23d 3.1.17 2016-06-11 11:59:06 -04:00
Luke Pulverenti
ea3b099f7f 3.1.16 2016-06-10 13:37:09 -04:00
Luke Pulverenti
a9355f7be9 3.1.15 2016-06-09 12:17:34 -04:00
Luke Pulverenti
fc6cb97d65 3.1.14 2016-06-08 11:25:37 -04:00
Luke Pulverenti
75b0faf0b1 3.1.13 2016-06-07 15:49:45 -04:00
Luke Pulverenti
4ec16f9f83 3.1.12 2016-06-07 12:27:55 -04:00
Luke Pulverenti
512efcc86b 3.1.11 2016-06-06 14:28:20 -04:00
Luke Pulverenti
c4dc925b00 3.1.10 2016-06-05 14:57:00 -04:00
Luke Pulverenti
3a72ace995 3.1.9 2016-06-04 12:14:23 -04:00
Luke Pulverenti
298fec447f 3.1.8 2016-06-03 20:18:36 -04:00
Luke Pulverenti
7f114566c4 3.1.7 2016-06-03 12:30:43 -04:00
Luke Pulverenti
c9f4bf830a 3.1.6 2016-06-02 12:21:00 -04:00
Luke Pulverenti
623c15ed99 3.1.5 2016-06-01 11:59:20 -04:00
Luke Pulverenti
b6f2439915 3.1.4 2016-05-31 14:48:20 -04:00
Luke Pulverenti
002f4824ef 3.1.3 2016-05-30 14:22:19 -04:00
Luke Pulverenti
776133e95f 3.1.2 2016-05-29 15:51:22 -04:00
Luke Pulverenti
52a327f4df 3.1.1 2016-05-28 19:48:32 -04:00
Luke Pulverenti
996da16d90 3.1.0 2016-05-26 15:24:39 -04:00
Luke Pulverenti
1848793b79 3.1.0 2016-05-25 13:05:38 -04:00
Luke Pulverenti
4aebdad4f7 fix merge conflict 2016-05-25 13:05:06 -04:00
Luke Pulverenti
9120acca43 3.0.5989 2016-05-24 22:18:25 -04:00
Luke Pulverenti
ba819f2e95 3.0.5988 2016-05-24 14:29:42 -04:00
Luke Pulverenti
88872dc28e 3.0.5987 2016-05-24 14:03:32 -04:00
Luke Pulverenti
5c29647a49 3.0.5986 2016-05-24 13:06:18 -04:00
Luke Pulverenti
74e3c3a129 3.0.5985 2016-05-23 15:41:18 -04:00
Luke Pulverenti
80a9d3c705 3.0.5984 2016-05-23 00:55:30 -04:00
Luke Pulverenti
af7b6e6fce restore version 2016-05-21 00:50:34 -04:00
Luke Pulverenti
6d0e37ef3f 3.0.5960 2016-05-15 13:15:39 -04:00
Luke Pulverenti
04dd829a48 3.0.5971 2016-05-15 12:32:24 -04:00
Luke Pulverenti
b91e10f91a 3.0.5970 2016-05-14 14:28:56 -04:00
Luke Pulverenti
b852da1054 3.0.5969 2016-05-14 11:31:41 -04:00
Luke Pulverenti
7b52f7cace 3.0.5968 2016-05-13 14:32:20 -04:00
Luke Pulverenti
43e6d144e2 3.0.5967 2016-05-12 02:01:58 -04:00
Luke Pulverenti
f5e5ca62a6 3.0.5966 2016-05-11 10:42:15 -04:00
Luke Pulverenti
237fc24100 3.0.5965 2016-05-10 15:32:42 -04:00
Luke Pulverenti
137b4bfc91 3.0.5964 2016-05-10 15:23:58 -04:00
Luke Pulverenti
486c6c3d22 3.0.5963 2016-05-10 12:21:52 -04:00
Luke Pulverenti
21736c6bef 3.0.5962 2016-05-10 01:18:56 -04:00
Luke Pulverenti
cfb0b96f30 3.0.5961 2016-05-09 15:29:54 -04:00
Luke Pulverenti
3bf2cf8985 3.0.5960 2016-05-09 11:49:31 -04:00
Luke Pulverenti
1995b35bcf 3.0.5959 2016-05-08 23:22:41 -04:00
Luke Pulverenti
13f3a491c7 3.0.5958 2016-05-08 09:39:52 -04:00
Luke Pulverenti
16c219b018 3.0.5957 2016-05-07 15:29:10 -04:00
Luke Pulverenti
a78143173e 3.0.5955 2016-05-06 22:23:13 -04:00
Luke Pulverenti
80832bc8d3 3.0.5955 2016-05-06 16:22:54 -04:00
Luke Pulverenti
75d82f505e 3.0.5954 2016-05-06 14:59:58 -04:00
Luke Pulverenti
27d705f1e9 3.0.5953 2016-05-06 02:04:35 -04:00
Luke Pulverenti
91aecea4d1 3.0.5952 2016-05-06 01:19:07 -04:00
Luke Pulverenti
674538d73a 3.0.5951 2016-05-04 13:31:16 -04:00
Luke Pulverenti
b01c12ca9c 3.0.5950 2016-05-03 16:13:38 -04:00
Luke Pulverenti
5328540fb0 3.0.5949 2016-05-02 14:34:57 -04:00
Luke Pulverenti
057eedc051 3.0.5948 2016-05-02 13:16:06 -04:00
Luke Pulverenti
1a69dee2e6 update version 2016-04-18 01:26:34 -04:00
Luke Pulverenti
48ffa74da8 3.0.5930 2016-04-17 17:07:38 -04:00
Luke Pulverenti
fd042e230d fix version 2016-04-17 17:00:18 -04:00
Luke Pulverenti
8b163221f7 fix merge conflict 2016-04-17 16:59:20 -04:00
Luke Pulverenti
b0839ffd2c restore version 2016-04-16 15:27:50 -04:00
Luke Pulverenti
007f4e193a fix merge conflict 2016-04-16 15:25:16 -04:00
Luke Pulverenti
670a388f61 3.0.5913 2016-04-09 22:35:44 -04:00
Luke Pulverenti
66c6bc2e60 3.0.5912 2016-04-03 16:14:46 -04:00
Luke Pulverenti
37e55ba637 3.0.5911 2016-03-27 18:47:58 -04:00
Luke Pulverenti
ff0e45a3f7 3.0.5921 2016-03-26 13:52:36 -04:00
Luke Pulverenti
661acc256a update version 2016-03-26 13:21:55 -04:00
Luke Pulverenti
d6832e7a41 3.0.5910 2016-03-25 13:52:28 -04:00
Luke Pulverenti
736e632410 fix merge conflict 2016-03-25 13:51:54 -04:00
Luke Pulverenti
4a7df961dc 3.0.5882 2016-03-03 21:54:39 -05:00
Luke Pulverenti
f70d12ef33 3.0.5881 2016-03-03 13:18:18 -05:00
Luke Pulverenti
ff000d581c 3.0.5880 2016-03-03 01:37:13 -05:00
Luke Pulverenti
3996d537e1 3.0.5896 2016-03-03 01:20:49 -05:00
Luke Pulverenti
e1b119fd3d 3.0.5872 2016-03-02 16:04:55 -05:00
Luke Pulverenti
a1df4e4842 3.0.5895 2016-03-02 12:09:38 -05:00
Luke Pulverenti
3e4d64fc0b 3.0.5894 2016-03-01 13:45:20 -05:00
Luke Pulverenti
5ce7c4cd05 3.0.5893 2016-03-01 11:20:32 -05:00
Luke Pulverenti
0e25c5a6c7 3.0.5892 2016-02-29 11:30:58 -05:00
Luke Pulverenti
c45df72a2a 3.0.5891 2016-02-28 12:49:41 -05:00
Luke Pulverenti
8125932639 3.0.5890 2016-02-27 22:41:01 -05:00
Luke Pulverenti
dc6b8d604d 3.0.5889 2016-02-27 00:46:13 -05:00
Luke Pulverenti
0d36fb05a7 3.0.5888 2016-02-25 21:45:27 -05:00
Luke Pulverenti
0989402574 3.0.5887 2016-02-24 11:59:55 -05:00
Luke Pulverenti
b57b6151ec 3.0.5886 2016-02-23 11:26:54 -05:00
Luke Pulverenti
5945a0c3be 3.0.5885 2016-02-22 11:30:26 -05:00
Luke Pulverenti
95366710b7 3.0.5884 2016-02-21 09:46:13 -05:00
Luke Pulverenti
08c78a4f35 3.0.5883 2016-02-20 14:20:32 -05:00
Luke Pulverenti
6dfebf40f3 3.0.5882 2016-02-19 12:20:35 -05:00
Luke Pulverenti
1bfde59af4 3.0.5881 2016-02-18 13:21:53 -05:00
Luke Pulverenti
deb712b165 restore change 2016-02-16 15:21:36 -05:00
Luke Pulverenti
b42317c0c4 fix merge conflict 2016-02-16 15:20:48 -05:00
Luke Pulverenti
b9ce0a3223 3.0.5871 2016-02-16 13:06:36 -05:00
Luke Pulverenti
e37bf6b986 restore changes 2016-02-16 12:15:50 -05:00
Luke Pulverenti
1285512160 fix merge conflict 2016-02-16 12:15:06 -05:00
Luke Pulverenti
ea83790305 3.0.5870 2016-02-14 23:51:14 -05:00
Luke Pulverenti
681ffa96b3 3.0.5868 2016-02-14 23:28:25 -05:00
Luke Pulverenti
77d7d562bd 3.0.5878 2016-02-14 23:18:05 -05:00
Luke Pulverenti
82f4518c55 fix merge conflict 2016-02-14 23:17:10 -05:00
Luke Pulverenti
ddd8a80654 restore version 2016-02-14 16:38:19 -05:00
Luke Pulverenti
f538793e2d 3.0.5867 2016-02-14 16:36:14 -05:00