Dave Cranwell
eb4c5a7ce2
nav-submenu required translate3d due to its fixed position in the presence of animation, apparently. Also animation vendor prefixing removed since autoprefixer handles this already
2015-12-02 17:39:26 +00:00
Matt Westcott
e671a83be5
Release note for #1978
2015-12-01 13:17:31 +00:00
Tim Heap
1d4a276f49
Use SiteManager for Sites, add tests
...
The SiteManager class was not used on the Site model, or anywhere else.
This was not caught by the tests, because nothing tested the relevant
attributes on the Site model, nor were they used in the code base. Tests
have been added now.
2015-11-30 14:35:25 +00:00
Matt Westcott
e5abe8df96
Release note for #1969
2015-11-27 16:15:21 +00:00
alx
88e477098f
Ensure that locked pages can't be unpublished.
...
Fixes #1615
2015-11-24 12:58:02 +00:00
Tim Heap
f4968de0f9
Allow overriding attributes in {% image %} tag
...
The `alt` attribute that was automatically generated as part of the
`{% image %}` tag could not be overridden. If template authors passed
their own `alt="..."` attribute in, two would be printed out instead
of the default one being overridden.
The relevant code has been refactored to build a dict of attributes,
allowing the default set to be overridden, and then printing them using
`flatatt`.
Fixes #1933
2015-11-24 11:38:10 +00:00
Karl Hobley
8edfcc168f
Changelog/release note for #1865
2015-11-19 15:30:23 +00:00
Matt Westcott
e08e35d470
Release note for #1447
2015-11-18 17:04:39 +00:00
Matt Westcott
4f59b215d8
Release note for #468
2015-11-18 13:04:50 +00:00
Karl Hobley
a36744ddea
Release note for #1925
2015-11-17 11:36:57 +00:00
Matt Westcott
6c8adaf0f7
Prepare for 1.2 release
...
Conflicts:
CHANGELOG.txt
wagtail/wagtailcore/__init__.py
2015-11-12 16:55:14 +00:00
Matt Westcott
204aa53ff4
Add Python 3.5 support to release notes
2015-11-12 16:43:49 +00:00
Karl Hobley
3bfd9fca9f
Created 1.3 changelog and release notes
2015-11-04 12:20:07 +00:00
Matt Westcott
fb063dea26
Add browsable API to changelog
2015-11-02 16:30:49 +00:00
Matt Westcott
257baedb5d
Release notes for #1837 and #1888
2015-11-02 16:10:18 +00:00
Karl Hobley
43a2e901f8
Changelog/release notes for #1873 , #1879 and #1881
2015-11-02 12:16:05 +00:00
Matt Westcott
8d96a24e49
Update translator list and add release note for new translations.
...
The translator list now only includes translators specifically identified in the .po files, so that we're not listing dormant Transifex accounts that didn't actually do anything :-)
2015-11-02 11:52:51 +00:00
Matt Westcott
0e7b92971a
Release note for #1718
2015-10-29 00:12:02 +00:00
Matt Westcott
6dd69acd86
Release note for #1746
2015-10-27 11:51:07 +00:00
Matt Westcott
e68d66a744
Release note for #1869
2015-10-27 11:19:44 +00:00
Karl Hobley
19d476b42a
Changelog/release notes for #1857 and #1866
2015-10-27 10:22:40 +00:00
Matt Westcott
566fa3a26f
Release note for #1670 / #1850 / #1854
2015-10-26 12:58:36 +00:00
Matt Westcott
d06c5070cc
Release note for #1725
2015-10-23 12:31:07 +01:00
Matt Westcott
a51fdf1279
Release note for #1754
2015-10-23 11:54:27 +01:00
Matt Westcott
94ee586276
Merge branch 'master' of https://github.com/torchbox/wagtail
...
Conflicts:
CHANGELOG.txt
docs/releases/1.2.rst
2015-10-23 10:00:52 +01:00
Matt Westcott
4d4cced717
Release note for #1596
2015-10-23 09:59:41 +01:00
Karl Hobley
ad4007f406
Release note for #1856
2015-10-23 09:57:01 +01:00
Matt Westcott
2eb4b4c2c1
Release notes for #1810 , #1835 , #1812
2015-10-20 11:16:09 +01:00
Matt Westcott
6994f7b7b5
Release note for #1843
2015-10-20 10:37:04 +01:00
Matt Westcott
bce6fba24f
Release note for #1741
2015-10-16 12:12:07 +01:00
Matt Westcott
da42620089
Release note for #1791
2015-10-14 17:26:03 +01:00
Matt Westcott
7e7ba37639
Release note for #1770
2015-10-14 17:16:21 +01:00
Matt Westcott
bb8894aa6c
Release note for #1821
2015-10-14 17:07:26 +01:00
Karl Hobley
ed1a0f9bb1
Merge pull request #1823 from gasman/fix/page-manager-from-queryset
...
Eliminate duplicated PageQuerySet methods / make `sibling_of` behaviour consistent
2015-10-14 14:35:14 +01:00
Matt Westcott
5bac77a648
Release note for #1822
2015-10-13 22:46:02 +01:00
Matt Westcott
0bb4bac2bc
Release note for #1815
2015-10-13 19:32:29 +01:00
Matt Westcott
dafbdaf20f
Use Manager.from_queryset
to construct PageManager, to avoid duplication of queryset methods.
...
This exposes an inconsistency between the old `PageManager.(not_)sibling_of` method (which was
exclusive by default) and `PageQuerySet.(not_)sibling_of)` (which is inclusive). We therefore
standardise on the inclusive behaviour (in line with treebeard's own sibling methods), and note
this change of behaviour in the release notes.
2015-10-13 19:15:12 +01:00
Matt Westcott
5b029cbfc4
Release note for #1702
2015-10-13 00:19:51 +01:00
Matt Westcott
cb7dc8fd38
Release note for #1696
2015-10-13 00:15:50 +01:00
Matt Westcott
5b8fd66909
Release note for #1682
2015-10-12 22:13:34 +01:00
Matt Westcott
6612f0adf3
Release note for #1529
2015-10-09 16:41:32 +01:00
Karl Hobley
ea436e51cc
Changelog/release note/contributor for #1688
2015-10-09 09:57:33 +01:00
Karl Hobley
6495bb6736
Merge pull request #1799 from anurag-ks/master
2015-10-08 09:35:48 +01:00
Karl Hobley
8a0f6eab30
Changelog/release note and contributor for #1799
2015-10-08 09:35:21 +01:00
Matt Westcott
94d0d7bda2
Release / upgrade consideration note for #1478
2015-10-07 20:02:25 +01:00
Karl Hobley
5caa1f0f1f
Release note for #1755
2015-10-06 22:21:25 +01:00
Karl Hobley
490ecff007
Changelog for #1709
2015-10-06 11:06:44 +01:00
Matt Westcott
cf9758138a
Release note for #1075
2015-10-05 22:54:37 +01:00
Matt Westcott
deee02e4d7
Release note for #1391
2015-10-05 18:41:48 +01:00
Karl Hobley
00a1402925
Changelog/release notes for #1783 and #1784
2015-10-05 17:03:25 +01:00
Matt Westcott
a02cc3e67c
Release note for #1744
2015-09-30 17:16:48 +01:00
Matt Westcott
c17583b8d1
Release note for #1704
2015-09-18 16:25:27 +01:00
Matt Westcott
31db84a216
Changelog for #1692
2015-09-18 11:29:50 +01:00
Matt Westcott
8ffe4578a3
Merge branch 'master' of https://github.com/torchbox/wagtail
2015-09-16 17:37:43 +01:00
Matt Westcott
8d123e29e9
version bump to 0.8.10 due to packaging issues (grr)
...
Conflicts:
CHANGELOG.txt
docs/releases/index.rst
wagtail/project_template/requirements.txt
wagtail/wagtailcore/__init__.py
2015-09-16 17:36:21 +01:00
Matt Westcott
307b12da52
Prepare for 0.8.9 release
...
Conflicts:
CHANGELOG.txt
wagtail/project_template/requirements.txt
wagtail/wagtailcore/__init__.py
2015-09-16 17:34:30 +01:00
Matt Westcott
d9103f48ec
Release note for 5a63a0b
2015-09-16 17:31:51 +01:00
Matt Westcott
9d386cf777
Release note for #1641 (backport to 0.8.x)
...
Conflicts:
CONTRIBUTORS.rst
2015-09-16 17:31:37 +01:00
Matt Westcott
76a653e5a6
Release note for #1660 (backport to 0.8.x)
...
Conflicts:
CHANGELOG.txt
docs/releases/index.rst
2015-09-16 17:28:57 +01:00
Karl Hobley
5e8df2624e
Changelog for #1677 and #1679
2015-09-16 09:35:23 +01:00
Matt Westcott
57d37b1154
prepare for 1.1 release
...
Conflicts:
CHANGELOG.txt
wagtail/wagtailcore/__init__.py
2015-09-15 12:45:54 +01:00
Matt Westcott
9ea7cd9f99
Release note for #1620
2015-09-09 15:23:29 +01:00
Matt Westcott
5ecc69c7a0
Release note for #1666
2015-09-04 14:50:04 +01:00
Matt Westcott
dc655192fe
Release notes for new translations
2015-09-04 14:21:55 +01:00
Matt Westcott
c17c7b1b87
Release note and upgrade consideration for #1631
2015-09-04 12:42:36 +01:00
Matt Westcott
87e4864729
Release note for #1445
2015-09-03 17:05:03 +01:00
Matt Westcott
e5a5761d5a
Release note for #1475
2015-09-03 16:30:18 +01:00
Matt Westcott
5fa6371fa1
Release note for #1660
2015-09-03 15:30:36 +01:00
Karl Hobley
da96a6758e
Changelog for #1589
2015-09-03 12:16:35 +01:00
Matt Westcott
3d1f83755b
Release note for #1612
2015-09-03 12:06:29 +01:00
Matt Westcott
1f5dc4c024
Release note for #1571
2015-09-03 10:38:13 +01:00
Matt Westcott
cfaed7faba
Release note for #1541
2015-09-02 16:34:27 +01:00
Karl Hobley
3062835918
Changelog for #1544
2015-09-02 14:54:58 +01:00
Matt Westcott
1ced5f0d6d
Release note for #1633
2015-08-28 23:07:49 +01:00
Matt Westcott
e25464eee9
Release note for #1626
2015-08-28 14:55:54 +01:00
Matt Westcott
1e4618935d
Release note for #1375
2015-08-28 10:59:19 +01:00
Matt Westcott
4353759018
Merge branch 'kaedroho-snippets-search'
...
Conflicts:
CHANGELOG.txt
2015-08-27 15:42:45 +01:00
Matt Westcott
7751a8439a
Release note for #1610
2015-08-27 15:41:32 +01:00
Karl Hobley
c33ec77150
Changelog for fill operation fix
2015-08-27 11:24:29 +01:00
Matt Westcott
c2421246a8
Release note for #1494
2015-08-26 16:38:08 +01:00
Karl Hobley
695099f958
Changelog for #1528
2015-08-26 14:08:20 +01:00
Karl Hobley
53e8285ae1
Changelog for #1641
2015-08-26 13:50:09 +01:00
Matt Westcott
d01421d2d6
Release note for #1605
2015-08-26 12:04:53 +01:00
Matt Westcott
f65d91ad01
Merge branch 'kaedroho-multiple-page-types-in-page-chooser3'
...
Conflicts:
CHANGELOG.txt
docs/releases/1.1.rst
wagtail/wagtailadmin/views/chooser.py
2015-08-25 16:20:32 +01:00
Matt Westcott
e39653c69b
Release note for #1621
2015-08-25 16:17:35 +01:00
Matt Westcott
314389f5ef
Release note for #1476
2015-08-25 10:06:17 +01:00
Matt Westcott
4657c62326
Release note for #1623
2015-08-20 16:53:56 +01:00
Karl Hobley
0ba28e5ca9
Changelog for #1587
2015-08-17 12:43:52 +01:00
Karl Hobley
cebe5249d0
Changelog/release notes for #1606
2015-08-17 12:16:32 +01:00
Karl Hobley
30408252ff
Contributor/changelog/release note for #1538
2015-08-03 14:35:58 +01:00
Matt Westcott
ea2cabca98
Release note for #1492
2015-08-01 11:22:59 +02:00
Matt Westcott
943310d097
add forgotten changelog items
2015-08-01 11:20:21 +02:00
Karl Hobley
488fcfc8d2
Changelog/release note for #1540
2015-07-28 11:26:49 +01:00
Karl Hobley
624c0511c5
Changelog/release note for #1537
2015-07-21 10:21:31 +01:00
Karl Hobley
eb9733610f
Changelog/release note for #1489 and #1520
2015-07-21 09:52:14 +01:00
Matt Westcott
1a7bde76d6
Release note for #1508
2015-07-20 20:09:15 +01:00
Matt Westcott
0921bdec6d
Release note for #1426
2015-07-20 14:49:55 +01:00
Karl Hobley
d1897f9c14
Changelog/release note for #1527
2015-07-19 16:19:14 +01:00
Matt Westcott
0ea3a73ae5
version 1.0 (for real this time)
...
Conflicts:
CHANGELOG.txt
2015-07-16 11:20:36 +01:00
Karl Hobley
449fdab7d8
Changelog and release note for API descendant_of filter
2015-07-15 10:00:46 +01:00
Matt Westcott
41ea332a74
release note for #1274
2015-07-09 19:29:07 +01:00
Karl Hobley
adc44cfa1a
Changelog/release note for #1444
2015-07-08 16:25:34 +01:00
Matt Westcott
f82f0ddab4
release note for #1251
2015-06-29 16:59:31 +01:00
Matt Westcott
16c8540771
release note for #1255
2015-06-26 16:37:48 +01:00
Matt Westcott
cc276dfe53
release note for #1212
2015-06-25 12:19:22 +01:00
Matt Westcott
90d4f322fd
Add 1.1 release notes page to docs + release note for #1434
2015-06-24 10:28:08 +01:00
Matt Westcott
d8f481ce2c
remove 'in development' from 0.8.8
...
Conflicts:
CHANGELOG.txt
2015-06-18 16:38:21 +01:00
Matt Westcott
63c52679b4
Add translations for Croatian and Finnish
2015-06-16 17:07:11 +01:00
Karl Hobley
78c1c79f10
Changelog/release note for #1412
2015-06-16 16:04:43 +01:00
Matt Westcott
7e89a8e4a2
changelog entry for #1406
2015-06-15 16:26:08 +01:00
Karl Hobley
5538b73e9e
Changelog/release note for #1388
2015-06-15 09:20:20 +01:00
Karl Hobley
36c124475c
Changelog/release note for #1400
2015-06-12 15:25:18 +01:00
Matt Westcott
c3c92ebb10
Release note for #1381
2015-06-10 13:43:03 +01:00
Karl Hobley
1ce5a441e5
Changelog/release note/contributor for #1266
2015-06-05 13:43:50 +01:00
Matt Westcott
15c6d027b4
release note for #1270
2015-06-03 12:17:02 +01:00
Karl Hobley
eb6f25bc66
Changelog/release note for #1365
2015-06-03 09:50:59 +01:00
Matt Westcott
992f4cafbe
Release note for #1272
2015-06-02 16:48:33 +01:00
Dan Braghis
be3be40389
Release/changelog notes for #1109
2015-06-01 14:30:07 +01:00
Matt Westcott
e2a44fe0a5
release note for #1349
2015-05-29 16:24:23 +01:00
Karl Hobley
9c48f65972
Changelog/release notes
2015-05-26 14:00:52 +01:00
Karl Hobley
c7f2837ad8
Changelog/contributor/release notes for #1289 and #1299
2015-05-15 09:05:40 +01:00
Karl Hobley
10fb0c4249
Changelog/release notes/contributors for #1176
2015-05-07 10:12:31 +01:00
Dan Braghis
e7e0ddcedd
Release/Changelog notes for #1263/#1269
2015-05-06 17:19:57 +01:00
Karl Hobley
b3030ac6b0
Changelog/release note/contributor for #1260
2015-05-03 11:26:12 +01:00
Matt Westcott
ad3a3d6c54
Finalise 0.8.7 in documentation
...
Conflicts:
CHANGELOG.txt
2015-04-29 14:08:32 +01:00
Matt Westcott
ea22d3d2f9
release note for #1244
2015-04-28 19:06:32 +01:00
Matt Westcott
9ebd6979ae
CAN HAZ DJANGO 1.8
2015-04-27 15:21:56 +01:00
Matt Westcott
d3a16b8d27
Release note for #1161
2015-04-27 14:51:33 +01:00
Matt Westcott
f7b2cfbb4e
Move release note for #1236 from 1.0 to 0.8.7
2015-04-27 14:22:01 +01:00
Matt Westcott
a4af4b9e0a
release note for #1226
2015-04-24 10:45:42 +01:00
Matt Westcott
777930c9a8
typo
2015-04-24 09:50:54 +01:00
Matt Westcott
35a8802fac
move release note item for #942 from 1.0 to 0.8.7
2015-04-23 16:54:41 +01:00
Matt Westcott
07cf971911
Release note for #1225
2015-04-23 16:12:39 +01:00
Karl Hobley
b5a3821dfa
Changelog/release note for #1222
2015-04-22 09:58:03 +01:00
Karl Hobley
6de6437298
Changelog/release note for #1218
2015-04-21 16:21:47 +01:00
Karl Hobley
3606d89b1c
Changelog/release note for #1186
2015-04-17 12:33:45 +01:00
Matt Westcott
42f96668ee
Merge branch 'update-hook-names' of https://github.com/zerolab/wagtail into zerolab-update-hook-names
...
Conflicts:
CHANGELOG.txt
2015-04-09 14:13:01 +01:00
Matt Westcott
7ff9f3ee50
Release note for #1147
2015-04-08 11:49:19 +01:00
Dan Braghis
aa5fe7574b
Tweak code and docs based on feedback
2015-04-03 18:34:03 +01:00
Dan Braghis
63672e0976
Add CHANGELOG and release notes for edit_bird hook rename
2015-04-03 13:39:46 +01:00
Karl Hobley
694860c6b6
Merge pull request #1031 from kaedroho/wagtailapi
...
Wagtail API module
2015-04-01 14:28:01 +01:00
Karl Hobley
7ad6b2e149
Changelog, release note and Upgrade consideration
2015-03-31 16:35:53 +01:00
Karl Hobley
addb57c0cd
Changelog and release notes for #728
2015-03-31 15:29:08 +01:00
Karl Hobley
d2bd3ebaef
Changelog/release note for #1120
2015-03-31 14:38:24 +01:00
Matt Westcott
a83a16de5c
release note for #1114
2015-03-30 12:41:01 +01:00
Matt Westcott
dbb4e763ee
version 0.9 shall now be known as version 1.0
2015-03-27 15:36:18 +00:00
Matt Westcott
52505fee21
release note for MySQL support
2015-03-27 15:13:15 +00:00
Matt Westcott
2977f46a86
Release note for #1093
2015-03-24 12:57:09 +00:00
Matt Westcott
8e3ea58b25
release note for #1018
2015-03-19 11:53:43 +00:00
Matt Westcott
fc6fe17c8c
release note for #1070
2015-03-19 11:12:44 +00:00
Matt Westcott
bd28d9288a
Increase the maximum length of a page slug from 50 to 255 characters - fixes #787
2015-03-18 10:49:46 +00:00
Matt Westcott
846b309593
Release note for #1054
2015-03-17 16:26:43 +00:00
Matt Westcott
80cb6e16e7
prepare for 0.8.6 release
...
Conflicts:
CHANGELOG.txt
wagtail/project_template/requirements.txt
wagtail/wagtailcore/__init__.py
2015-03-10 17:32:14 +00:00
Karl Hobley
4f7edeed1f
Changelog/release note for #1037
2015-03-10 13:07:03 +00:00
Karl Hobley
38b7afc8ed
Changelog/release note for #1044
2015-03-10 12:07:16 +00:00
Matt Westcott
3efad3089d
release note for #1045
2015-03-06 13:57:45 +00:00
Matt Westcott
11cb63d892
release note for #1036
2015-03-04 10:54:34 +00:00
Dan Braghis
2895aac7f3
Add changelog/release notes for #1022
2015-02-27 14:48:55 +00:00
Dan Braghis
99f94baa4a
Add changelog/release notes for #935/#1013
2015-02-23 10:01:38 +00:00
Matt Westcott
d7e1fd497e
release note for #1014
2015-02-20 15:45:38 +00:00
Karl Hobley
c7f7146055
Changelog and release note for #1003
2015-02-20 13:34:35 +00:00
Matt Westcott
58e051f906
Release note / upgrade consideration note for #992
2015-02-18 15:22:10 +00:00
Matt Westcott
8f5412e76c
release note for #999
2015-02-18 10:50:10 +00:00
Matt Westcott
763b5df8c4
Release note for #1001
2015-02-18 10:19:59 +00:00
Matt Westcott
735f879784
version bump 0.8.x branch to 0.8.5
2015-02-17 16:56:34 +00:00
Matt Westcott
6c9df29e57
no markdown in the changelog, thx
2015-02-17 16:46:42 +00:00
Matt Westcott
adaf36edd6
release note for #998 (and add a missing apostrophe)
2015-02-17 16:42:14 +00:00
Dan Braghis
7fabf23fae
Move changelog entry for 997 to 0.8.5 instead of 0.9
2015-02-17 14:41:02 +00:00
Dan Braghis
1aa9bae6e8
Add changelog and release notes for #997
2015-02-17 14:18:00 +00:00
Matt Westcott
42a48b0085
release note for 4068385
2015-02-16 15:09:02 +00:00
Matt Westcott
c921023702
release note for #917
2015-02-16 13:49:01 +00:00
Dan Braghis
8fe8c5bc13
Add changelog/release notes for #978
2015-02-12 14:46:31 +00:00
Karl Hobley
6fef8f441d
Changelog and release notes for #990
2015-02-12 13:53:40 +00:00
Karl Hobley
d4ab7e833f
Changelog, release notes and contributor entry for #620
2015-02-09 12:39:12 +00:00
Karl Hobley
ed6e13f171
Changelogs for #957 and #960
2015-02-04 16:15:58 +00:00
Tom Talbot
27048acda7
Changelog for #825
2015-02-04 16:00:13 +00:00
Karl Hobley
fcd0e19bc5
Changelog for #942
2015-02-03 10:47:29 +00:00
Dan Braghis
800c5ba265
Add release notes for #913
2015-02-02 21:35:32 +00:00
Karl Hobley
4efed6b041
Update CHANGELOG.txt
2015-02-02 11:45:56 +00:00
Karl Hobley
9dafaa86c5
Update CHANGELOG.txt
2015-01-29 10:41:12 +00:00
Karl Hobley
365821c2d9
Update CHANGELOG.txt
2015-01-29 10:37:31 +00:00
Matt Westcott
211ddb0376
release note for #939
2015-01-28 20:13:46 +00:00
Dan Braghis
c542494048
Changelog/release notes for the admin url fixes
2015-01-28 15:09:05 +00:00
Dan Braghis
70ea948eaa
Remove stray . from changelog/release notes
2015-01-28 11:57:26 +00:00
Dan Braghis
f6ca8764a3
Changelog/release notes for search view query parameter
2015-01-28 11:56:35 +00:00
Karl Hobley
bb160022ed
Changelog/release notes for support dropping
2015-01-28 11:34:18 +00:00
Karl Hobley
e0fe9af555
Changelog/release note for #898
2015-01-18 14:46:36 +00:00
Karl Hobley
0a1c8f57e7
Update CHANGELOG.txt
2015-01-18 14:25:54 +00:00
Karl Hobley
b8e757c692
Changelog/release note for #878
2015-01-18 14:22:15 +00:00
Karl Hobley
fd247e69cd
Changelog/release notes for #854
2015-01-15 13:59:54 +00:00
Matt Westcott
d73e618e83
docs and release note for #880
2015-01-14 22:06:38 +00:00
Matt Westcott
f2d90844c7
release note for #869
2014-12-16 16:59:46 +00:00
Matt Westcott
250e5d97fb
Conflicts:
...
docs/releases/index.rst
2014-12-16 16:50:09 +00:00
Matt Westcott
6664b063cc
release note for #872
...
Conflicts:
CONTRIBUTORS.rst
2014-12-16 16:43:55 +00:00
Matt Westcott
d8ac5bf839
copy 0.8.4 doc updates into master
2014-12-04 15:46:28 +00:00
Karl Hobley
1637c7ba33
Spacing consistency in CHANGELOG.txt
2014-12-03 17:15:54 +00:00
Karl Hobley
3511ce23ee
Release note for #844
2014-12-03 14:20:25 +00:00
Matt Westcott
f39a95ab4f
Release notes for #842
2014-12-03 13:53:51 +00:00
Karl Hobley
46d0d98706
Added changelog/release notes for 0.8.4
2014-12-02 15:14:27 +00:00
Karl Hobley
1fc4302f3a
Merge branch 'pr-838'
...
Conflicts:
CHANGELOG.txt
CONTRIBUTORS.rst
docs/releases/0.9.rst
2014-12-02 14:56:49 +00:00