Commit Graph

608 Commits

Author SHA1 Message Date
Parker Moore 68d491c40d Update history to reflect merge of #2205 [ci skip] 2014-04-21 23:01:47 -04:00
Parker Moore 49c0f9cccc Update history to reflect merge of #2250 [ci skip] 2014-04-20 16:02:50 -04:00
Parker Moore 3c94b4d408 Update history to reflect merge of #2247 [ci skip] 2014-04-19 14:45:04 -04:00
Parker Moore 4da060ca52 Update history to reflect merge of #2244 [ci skip] 2014-04-19 14:19:21 -04:00
Parker Moore fa9c933773 Update history to reflect merge of #2243 [ci skip] 2014-04-18 17:47:46 -04:00
Parker Moore 2a9c1a2cd2 Update history to reflect merge of #2199 [ci skip] 2014-04-14 23:14:26 -04:00
Matt Rogers f0d4fefb6a Update history to reflect merge of #1492 [ci skip] 2014-04-14 20:17:06 -05:00
Parker Moore 3f03c7a9d6 Update history to reflect merge of #2211 [ci skip] 2014-04-14 13:00:48 -04:00
Parker Moore 5068be3c27 Update history to reflect merge of #2216 [ci skip] 2014-04-08 09:00:59 -04:00
Parker Moore 77d938065f Update history to reflect merge of #2215 [ci skip] 2014-04-08 00:45:10 -04:00
Parker Moore 75854b5d0b Update history to reflect merge of #2214 [ci skip] 2014-04-06 13:37:06 -04:00
Parker Moore 5f2709b410 Update history to reflect merge of #2213 [ci skip] 2014-04-06 13:36:16 -04:00
Parker Moore 51bb98c03a Update history to reflect merge of #2206 [ci skip] 2014-04-04 19:15:15 -04:00
Parker Moore 69a9ce214f Update history to reflect merge of #2189 [ci skip] 2014-04-02 22:38:49 -04:00
Parker Moore a096f9af50 Update history to reflect merge of #2197 [ci skip] 2014-04-02 22:16:18 -04:00
Parker Moore 0540a3351c Update history to reflect merge of #1823 [ci skip] 2014-04-02 21:51:50 -04:00
Parker Moore 795d240379 Update history to reflect merge of #2192 [ci skip] 2014-04-02 14:39:42 -04:00
Parker Moore 781e257298 Update history to reflect merge of #1568 [ci skip] 2014-04-02 14:10:33 -04:00
Parker Moore c2dff6bbf7 Update history to reflect merge of #1824 [ci skip] 2014-04-02 14:08:31 -04:00
Parker Moore 31443e978d Update history to reflect merge of #2110. [ci skip]
Closes #2110.
2014-04-02 14:06:54 -04:00
Parker Moore 21ea105a82 Update history to reflect merge of #2185 [ci skip] 2014-04-02 14:03:19 -04:00
Parker Moore d951ed6f0d Update history to reflect merge of #2193 [ci skip] 2014-04-02 14:01:02 -04:00
Parker Moore 48e1f23b86 Update history to reflect merge of #2177 [ci skip] 2014-04-02 14:00:21 -04:00
Parker Moore 2267f81632 Update history to reflect merge of #2200 [ci skip] 2014-04-01 23:11:16 -04:00
Parker Moore 9603d8a013 Update history to reflect merge of #2191 [ci skip] 2014-04-01 17:31:15 -04:00
Parker Moore e20491759d Update dat history format so it's right whoopsies. 2014-04-01 11:07:45 -04:00
Parker Moore 14470b8bc6 Update history to reflect merge of #2187 [ci skip] 2014-03-31 13:55:03 -04:00
Parker Moore 0435f618f6 Update history to reflect merge of #2186 [ci skip] 2014-03-31 13:43:30 -04:00
Parker Moore 34cc0b2b8b Update history to reflect merge of #1639 [ci skip] 2014-03-30 23:58:22 -04:00
Parker Moore 9f60dfc92d Update history to reflect merge of #2131 [ci skip] 2014-03-30 02:19:52 -04:00
Parker Moore 215477f139 Update history to reflect merge of #2165 [ci skip] 2014-03-30 00:19:38 -04:00
Parker Moore 0859c1d1ad Update history to reflect merge of #2175 [ci skip] 2014-03-29 23:19:03 -04:00
Parker Moore 24e4c2706a Update history to reflect merge of #2178 [ci skip] 2014-03-28 14:26:41 -04:00
Parker Moore c7b93603d1 Add 1.5.1 to changelog. 2014-03-28 02:30:16 -04:00
Parker Moore ed6e1c7f0b Update history to reflect merge of #2130 [ci skip] 2014-03-26 11:34:27 -04:00
Pirogov Evgenij 11db020124 A tiny fix to changelog
cucmber -> cucumber
2014-03-25 17:32:23 +02:00
Parker Moore 722892cd96 Update history with 1.5.0 release. [ci skip] 2014-03-24 21:43:00 -04:00
Parker Moore f8e0cc8fe4 Update history to reflect merge of #2164 [ci skip] 2014-03-23 14:27:20 -04:00
Matt Rogers 862b69c640 Update history to reflect merge of #2163 [ci skip] 2014-03-21 12:07:48 -05:00
Parker Moore 93700f91e7 Update history to reflect merge of #2160 [ci skip] 2014-03-20 23:29:09 -07:00
Parker Moore c658f9172c Update history to reflect merge of #2148 [ci skip] 2014-03-20 13:25:40 -04:00
Parker Moore 96bb687fcc Update history to reflect merge of #2158 [ci skip] 2014-03-19 23:48:20 -04:00
Matt Rogers 32676e9062 Update history to reflect merge of #2155 [ci skip] 2014-03-18 23:07:41 -05:00
Parker Moore d3f12c84ad Update history to reflect merge of #994 [ci skip] 2014-03-17 17:59:05 -04:00
Parker Moore 4aa2b34182 Update history to reflect merge of #2150 [ci skip] 2014-03-17 17:44:46 -04:00
Parker Moore 698d828a41 Update history to reflect merge of #2129 [ci skip] 2014-03-16 13:30:24 -04:00
Parker Moore 8af2a9ade3 Update history to reflect merge of #2143 [ci skip] 2014-03-16 13:25:16 -04:00
Parker Moore 7288176f65 Update history to reflect merge of #2126 [ci skip] 2014-03-13 10:39:38 -04:00
Parker Moore 72438dbdaa Update history to reflect merge of #2128 [ci skip] 2014-03-12 15:34:40 -04:00
Parker Moore 98109d2e39 Update history to reflect merge of #2122 [ci skip] 2014-03-11 11:10:32 -04:00
Parker Moore 84a911f145 Update history to reflect merge of #2109 [ci skip] 2014-03-11 11:09:12 -04:00
Parker Moore fd1a95ac87 Update history to reflect merge of #2121 [ci skip] 2014-03-11 08:32:59 -04:00
Matt Rogers 48d5f79d9a Update history to reflect merge of #2118 [ci skip] 2014-03-09 14:06:48 -05:00
Parker Moore 05664acd36 Update history to reflect merge of #2112 [ci skip] 2014-03-04 17:02:05 -05:00
Parker Moore 171452095f Update history to reflect merge of #2108 [ci skip] 2014-03-03 20:12:29 -05:00
Parker Moore f3dfe1dd09 Update history to reflect merge of #2098 [ci skip] 2014-02-28 21:37:02 -05:00
Parker Moore bbcd5bc8c7 Update history to reflect merge of #2105 [ci skip] 2014-02-27 17:56:49 -05:00
Parker Moore 12375846c8 Update history to reflect merge of #2102 [ci skip] 2014-02-27 08:34:22 -05:00
Parker Moore d21ab37abd Update history to reflect merge of #2081 [ci skip] 2014-02-24 18:58:41 -05:00
Parker Moore 644f012c42 Update history to reflect merge of #2097 [ci skip] 2014-02-24 18:56:46 -05:00
Parker Moore f5890e343f Update history to reflect merge of #2096 [ci skip] 2014-02-24 16:55:41 -05:00
Matt Rogers 83e3c0f7ba Update history to reflect merge of #2095 [ci skip] 2014-02-24 15:23:15 -06:00
Parker Moore 61397cd302 Update history to reflect merge of #2094 [ci skip] 2014-02-24 16:21:00 -05:00
Parker Moore ed5670eb48 Update history to reflect merge of #2050 [ci skip] 2014-02-24 16:09:10 -05:00
Parker Moore 87a3208df2 Update history to reflect merge of #2067 [ci skip] 2014-02-23 20:15:47 -05:00
Parker Moore de7a944601 Update history to reflect merge of #2065 [ci skip] 2014-02-23 20:07:05 -05:00
Parker Moore 89e914b160 Update history to reflect merge of #2084 [ci skip] 2014-02-21 18:22:47 -05:00
Parker Moore d6ecb5025a Update history to reflect merge of #2085 [ci skip] 2014-02-21 18:21:32 -05:00
Parker Moore 53ad55a1b2 Update history to reflect merge of #2090 [ci skip] 2014-02-21 18:19:53 -05:00
Matt Rogers 276b400a86 Update history to reflect merge of #2061 [ci skip] 2014-02-20 14:30:34 -06:00
Matt Rogers 1c4974f6ea Update history to reflect merge of #2074 2014-02-19 17:09:10 -06:00
Parker Moore de3570714f Update history to reflect merge of #2077 [ci skip] 2014-02-19 14:53:00 -05:00
Parker Moore 0d1fcc0691 Update history to reflect merge of #2075 [ci skip] 2014-02-19 14:15:41 -05:00
Parker Moore 45a5671c55 Update history to reflect merge of #2073 [ci skip] 2014-02-19 11:11:25 -05:00
Parker Moore b1812e7711 Move Kramdown version bump to Minor Enhancements section.
Closes #2069.
2014-02-19 00:13:24 -05:00
Parker Moore 9414280aa7 Update history to reflect merge of #2058 [ci skip] 2014-02-18 01:53:47 -05:00
Parker Moore 7706231f16 Update history to reflect merge of #2041 [ci skip] 2014-02-17 16:23:50 -05:00
Parker Moore 84471ba202 Update history to reflect merge of #1946 [ci skip] 2014-02-16 22:14:43 -05:00
Parker Moore 594e2a94c7 Update history to reflect merge of #2042 [ci skip] 2014-02-16 21:36:40 -05:00
Parker Moore c4f5415ece Update history to reflect merge of #2056 [ci skip] 2014-02-16 21:12:03 -05:00
Parker Moore c6b4c41aab Update history to reflect merge of #2048 [ci skip] 2014-02-15 17:28:06 -05:00
Parker Moore 8d39bf3850 Update history to reflect merge of #2049 [ci skip] 2014-02-15 17:26:34 -05:00
Parker Moore da446c0f19 Update history to reflect merge of #2047 [ci skip] 2014-02-14 15:41:07 -05:00
Matt Rogers c77ef87b05 Update history to reflect merge of #2045 2014-02-14 12:46:10 -06:00
Parker Moore 1482c8aecc Update history to reflect merge of #2044 [ci skip] 2014-02-14 13:36:32 -05:00
Parker Moore 729b6db7c2 Update history to reflect merge of #2009 [ci skip] 2014-02-13 17:56:57 -05:00
Matt Rogers & Persa Zula ec93743659 Update history to reflect merge of #1976 2014-02-13 12:39:00 -06:00
Parker Moore 54e5e660db Update history to reflect merge of #2031 [ci skip] 2014-02-13 12:54:21 -05:00
Parker Moore 8929d1bd63 Update history to reflect merge of #2038 [ci skip] 2014-02-13 12:52:54 -05:00
Parker Moore b6c8b39899 Update history to reflect merge of #1988 [ci skip] 2014-02-08 17:08:30 -05:00
Parker Moore 2e2563fab9 Update history to reflect merge of #2015 [ci skip] 2014-02-08 00:34:16 -05:00
Parker Moore 71b2257829 Update history to reflect merge of #2016 [ci skip] 2014-02-08 00:33:32 -05:00
Parker Moore a63e62f643 Update history to reflect merge of #2020 [ci skip] 2014-02-08 00:32:20 -05:00
Parker Moore 182a49fcff Update history to reflect merge of #2013 [ci skip] 2014-02-04 17:04:01 -05:00
Matt Rogers 1e6847c43f Update history to reflect merge of #1982 2014-01-31 08:48:18 -06:00
Matt Rogers 37dbc646a1 Update history to reflect merge of #2005 2014-01-31 08:45:14 -06:00
Matt Rogers 1470a8a997 Update history to reflect merge of #2004 2014-01-31 08:44:33 -06:00
Parker Moore 03ba5d8d18 Update history to reflect merge of #2001 [ci skip] 2014-01-31 00:24:59 -05:00
Matt Rogers 669cc496cd Update history to reflect merge of #1991 2014-01-30 20:39:46 -06:00
Parker Moore 1d014edca2 Update history to reflect merge of #1999 [ci skip] 2014-01-28 23:40:08 -05:00
Parker Moore dbd3d15f29 Update history to reflect merge of #1998 [ci skip] 2014-01-28 23:39:12 -05:00
Parker Moore c9a732c4f9 Update history to reflect merge of #1993 [ci skip] 2014-01-26 13:39:31 -05:00
Matt Rogers ea397d0946 Update history to reflect merge of #1984 2014-01-24 21:45:37 -06:00
Matt Rogers ecc05e57ae Update history to reflect merge of #1985 2014-01-24 21:42:59 -06:00
Matt Rogers 2e1ab7e6fe Update history to reflect merge of #1983 2014-01-24 21:10:50 -06:00
Matt Rogers b2c45aafdc Update history to reflect merge of #1932 2014-01-24 17:17:55 -06:00
Matt Rogers 8114ae6552 Update history to reflect merge of #1931 2014-01-22 07:38:33 -06:00
Parker Moore 30d8743853 Update history to reflect merge of #1951 [ci skip] 2014-01-21 23:07:28 -05:00
Parker Moore f2fadd6562 Update history to reflect merge of #1962 [ci skip] 2014-01-21 23:05:46 -05:00
Matt Rogers 9210d4ebd8 Update history to reflect merge of #1935 2014-01-21 07:50:14 -06:00
Parker Moore d37ea10cf8 Update history to reflect merge of #1970 [ci skip] 2014-01-19 23:18:59 -05:00
Matt Rogers a859c4509a Update history to reflect merge of #1971 2014-01-19 22:06:43 -06:00
Parker Moore e7139cbd85 Update history to reflect merge of #1953 [ci skip] 2014-01-15 23:40:17 -08:00
Matt Rogers 8337cbb31f Update history to reflect merge of #1958 2014-01-15 23:24:27 -06:00
Matt Rogers 0be62fa2e0 Update history to reflect merge of #1947 2014-01-15 22:13:37 -06:00
Matt Rogers 5dc4c67344 Merge pull request #1947 from jekyll/1-4-3-release-info 2014-01-15 20:13:31 -08:00
Parker Moore ea94e5dd1c Update history to reflect merge of #1949 [ci skip] 2014-01-14 08:56:28 -08:00
Parker Moore b3064a9b7d Forgot #1943 in the line, whoopsie 2014-01-14 08:44:20 -08:00
Parker Moore dc599121a0 Update history to reflect merge of #1943 [ci skip] 2014-01-14 08:43:53 -08:00
Parker Moore e87cd8d53c Update History.markdown with 1.4.3 release. 2014-01-13 22:27:41 -08:00
Matt Rogers 750a56d1fe Update history to reflect merge of #1940 2014-01-13 13:13:31 -06:00
Matt Rogers 2c2beb9c1f Update history to reflect merge of #1938 2014-01-13 09:16:29 -06:00
Parker Moore 0d6db1613f Update history to reflect merge of #1936 [ci skip] 2014-01-12 21:30:18 -08:00
Parker Moore f8c904908a Update history to reflect merge of #1933.
[ci skip]
2014-01-12 13:53:56 -08:00
Parker Moore 8bc51fdb5c Update history to reflect merge of #1928 [ci skip] 2014-01-11 15:32:12 -08:00
Matt Rogers cc2ac99487 Update history to reflect merge of #1916 2014-01-11 12:37:33 -06:00
Matt Rogers 60524a1b6c Update history to reflect merge of #1923 2014-01-11 12:35:51 -06:00
Matt Rogers 649e5a156a Update history to reflect merge of #1927 2014-01-11 12:20:19 -06:00
Parker Moore 459a4c1e55 Update history to reflect merge of #1883 [ci skip] 2014-01-06 20:55:43 -08:00
Parker Moore 437693e744 Update history to reflect merge of #1912 [ci skip] 2014-01-04 14:09:49 -08:00
Matt Rogers b05a44cb2a Update history to reflect merge of #1910 2014-01-04 10:12:24 -06:00
Matt Rogers 6184c4e44b Update history to reflect merge of #1899 2014-01-04 10:04:24 -06:00
Matt Rogers bbcd94e7fa Update history to reflect merge of #1875 2014-01-04 10:01:58 -06:00
Parker Moore 32b952803e Update history to reflect merge of #1898 2014-01-03 21:14:12 -08:00
Parker Moore eb67894e0f Update history to reflect merge of #1900 2014-01-03 11:12:48 -08:00
Parker Moore b273ac38a6 Update history to reflect merge of #1902 2014-01-02 13:26:08 -08:00
Parker Moore 36495487a3 Update history to reflect merge of #1889 2013-12-31 18:52:24 -08:00
Parker Moore 29720674dc Update history to reflect merge of #1896 2013-12-31 18:50:07 -08:00
Parker Moore b0ca19c67b Update history to reflect merge of #1897 2013-12-31 18:48:46 -08:00
Matt Rogers 012387396a Merge pull request #1859 from robin850/rouge 2013-12-30 22:45:07 -06:00
Matt Rogers 47e4e81053 Update history to reflect merge of #1849 2013-12-30 22:32:21 -06:00
Parker Moore 7c276c6f64 Update history to reflect merge of #1894 2013-12-30 16:35:48 -08:00
Parker Moore ac9bca80c8 Update history to reflect merge of #1893 2013-12-30 11:07:50 -08:00
Parker Moore 194109d677 Update history to reflect merge of #1886 2013-12-28 13:46:40 -05:00
Parker Moore da8571beec Update history to reflect merge of #1879 2013-12-26 15:23:28 -05:00
Parker Moore 7093d3aa82 Update history to reflect merge of #1877 2013-12-26 02:02:42 -05:00
Parker Moore a2853456b6 Update history to reflect merge of #1825 2013-12-26 01:33:17 -05:00
Parker Moore 46e47e6713 Update history to reflect merge of #1831 2013-12-26 01:14:48 -05:00
Parker Moore 92c3d6d3fd Update history to reflect merge of #1841 2013-12-26 01:12:40 -05:00
Parker Moore fbf2b5734e Update history to reflect merge of #1866 2013-12-26 01:07:01 -05:00
Parker Moore 0ebec0b03f Update history to reflect merge of #1872 2013-12-26 01:06:02 -05:00
Parker Moore 1550c60278 Update history to reflect merge of #1847 2013-12-24 14:05:54 -05:00
Parker Moore 169e526f2f Update history to reflect merge of #1867 2013-12-24 14:05:00 -05:00
Parker Moore 42aef79ab3 Update history to reflect merge of #1864 2013-12-22 22:15:09 -05:00
Robin Dupret 0831d2b0f8 Add support for the Rouge syntax highlighter
By setting the `highlighter` setting to `rouge` you can now easily
highlight your code with it instead of relying on Pygments. However,
Jekyll doesn't depend on Rouge explicitly, you will need to install it
or add it to your Gemfile.

The documentation has been updated accordingly.
2013-12-22 18:45:40 +01:00
Robin Dupret 92064134d6 Rename the pygments option to highlighter
Rename the pygments configuration option to highlighter to allow
different highlighters in the future. For now, the allowed values are
`pygments` and `null`.

It's now more straightforward to plug another syntax highlighter.
2013-12-22 12:45:15 +01:00
Robin Dupret 903cce2745 Fix the highlight tag feature
Previously, the assertion made wasn't enough to check whether the code
block was correctly parsed through Pygments (and it was not the case).
This commit simply ensure there is a div with the "highlight" class and
fix the test to correctly invoke the Liquid tag rendering.
2013-12-22 12:29:19 +01:00
Parker Moore 354b4b9c54 Update history to reflect merge of #1854 2013-12-19 19:58:36 -05:00
Parker Moore 8cb1dc47d9 Update history to reflect merge of #1848 2013-12-19 15:20:51 -05:00
Parker Moore 12a55b86ac Update history to reflect merge of #1836 2013-12-16 20:32:28 -05:00
Parker Moore 6b5ce3a9f0 Add v1.4.2 to History.markdown 2013-12-16 20:26:43 -05:00
Parker Moore b7bdcb19ca Update history to reflect merge of #1818 2013-12-11 18:31:13 -05:00
Matt Rogers 6d0a168d6d Update history to reflect merge of #1817 2013-12-11 16:47:37 -06:00
Matt Rogers 379093f940 Update history to reflect merge of #1815 2013-12-11 16:00:47 -06:00
Parker Moore 827c4b9bda Update history to reflect merge of #1812 2013-12-11 16:53:39 -05:00
Matt Rogers e5c8c94cd1 Update history to reflect merge of #1780 2013-12-11 08:08:14 -06:00
Matt Rogers fc760c1604 Update history to reflect merge of #1706 2013-12-10 23:16:44 -06:00
Matt Rogers b49c6508f5 Update history to reflect merge of #1805 2013-12-10 22:58:48 -06:00
Matt Rogers 48834891ac Update history to reflect merge of #1799 2013-12-10 22:30:55 -06:00
Parker Moore 8d44fa913b Update history to reflect merge of #1803 2013-12-10 17:49:44 -05:00
Parker Moore 01ee2ada7c Update history to reflect merge of #1804 2013-12-10 16:14:25 -05:00
Parker Moore 6e74ec2f71 Update history to reflect merge of #1788 2013-12-10 11:49:44 -05:00
Matt Rogers c669d1519d Reformat to match the rest of the file 2013-12-09 21:39:24 -06:00
Matt Rogers a81479adbf Update history to reflect merge of #1795 2013-12-09 21:36:23 -06:00
Matt Rogers 8ebd5852cd Updates for the 1.4.1 release
The 1.4.1 release is on the v1-stable branch
2013-12-09 20:49:15 -06:00
Matt Rogers 10e350d47b Update history to reflect merge of #1796 2013-12-09 20:24:31 -06:00
Parker Moore df1a999031 Update history to reflect merge of #1800 2013-12-09 18:00:09 -05:00
Parker Moore 5495e0b21a Update history to reflect merge of #1797 2013-12-09 17:57:40 -05:00
Parker Moore 4fb6022113 Update history to reflect merge of #1791 2013-12-09 12:33:36 -05:00
Parker Moore d2e948600f Update history to reflect merge of #1787 2013-12-08 01:05:10 -05:00
Parker Moore fa3476dd2a Update history to reflect merge of #1657 2013-12-08 00:43:44 -05:00
Parker Moore 315fb0cf20 Use YYYY-MM-DD in History file :) 2013-12-07 19:31:48 -05:00
Matt Rogers 7da676bcc2 Update History.markdown for the 1.4.0 release 2013-12-07 17:58:51 -06:00
Matt Rogers & Persa Zula 8b0ea62535 Update history to reflect merge of #1779 2013-12-06 23:03:59 -06:00
Parker Moore e14fe116db Update history to reflect merge of #1778 2013-12-05 21:43:11 -05:00
Matt Rogers 654fe6117b Update history to reflect merge of #1682 2013-12-04 20:40:58 -06:00
Matt Rogers dc7be86970 Update history to reflect merge of #1765 2013-12-04 20:28:58 -06:00
Matt Rogers 4076b12400 Update history to reflect merge of #1772 2013-12-04 20:25:34 -06:00
Parker Moore 7af757a3fc Update history to reflect merge of #1762 2013-12-02 15:36:55 -05:00
Parker Moore 6768977c27 Update history to reflect merge of #1755 2013-12-02 15:35:43 -05:00
Parker Moore 9cfe1f0a9c Update history to reflect merge of #1769 2013-12-01 19:27:03 -05:00
Matt Rogers 91a4c5611e Prep for the 1.3.1 release 2013-11-26 20:27:27 -06:00
Matt Rogers 4cc0bdf8ff Update history to reflect merge of #1759 2013-11-26 19:46:46 -06:00
Matt Rogers 47eac96fdc Update history to reflect merge of #1754 2013-11-25 20:56:51 -06:00
Matt Rogers 7cda916faa Update history to reflect merge of #1448 2013-11-22 23:00:24 -06:00
Matt Rogers 33be5b0361 Update history to reflect merge of #1746 2013-11-22 22:30:29 -06:00
Matt Rogers 16f4d025ab Update history to reflect merge of #1736 2013-11-22 22:23:27 -06:00
Matt Rogers 8595ea812c Update history to reflect merge of #1718 2013-11-22 20:32:27 -06:00
Parker Moore ed7fb46b96 Update history to reflect merge of #1741 2013-11-21 15:57:03 -05:00
Parker Moore 063ee6fb67 Update history to reflect merge of #1734 2013-11-19 13:49:52 -05:00