]> granicus.if.org Git - python/log
python
9 years agoIssue 20691: Add follow_wrapped arg to inspect.signature/from_callable.
Yury Selivanov [Wed, 20 May 2015 18:30:08 +0000 (14:30 -0400)]
Issue 20691: Add follow_wrapped arg to inspect.signature/from_callable.

9 years agoIssue 24215: Added tests for more builtin types in test_pprint.
Serhiy Storchaka [Wed, 20 May 2015 16:38:05 +0000 (19:38 +0300)]
Issue 24215: Added tests for more builtin types in test_pprint.
Made test_pprint and test_trace discoverable.

9 years agoIssue 24215: Added tests for more builtin types in test_pprint.
Serhiy Storchaka [Wed, 20 May 2015 16:37:10 +0000 (19:37 +0300)]
Issue 24215: Added tests for more builtin types in test_pprint.
Made test_pprint and test_trace discoverable.

9 years agoUpdates PCBuild.sln to open with VS 2015 by default.
Steve Dower [Wed, 20 May 2015 16:30:42 +0000 (09:30 -0700)]
Updates PCBuild.sln to open with VS 2015 by default.

9 years agoIssue #24134: Use assertRaises() in context manager form in test_slice to
Serhiy Storchaka [Wed, 20 May 2015 15:38:39 +0000 (18:38 +0300)]
Issue #24134: Use assertRaises() in context manager form in test_slice to
avoid passing the test accidently because slice.__hash__ is None.

9 years agoIssue #24134: Use assertRaises() in context manager form in test_slice to
Serhiy Storchaka [Wed, 20 May 2015 15:37:37 +0000 (18:37 +0300)]
Issue #24134: Use assertRaises() in context manager form in test_slice to
avoid passing the test accidently because slice.__hash__ is None.

9 years agoIssue #22955: attrgetter, itemgetter and methodcaller objects in the operator
Serhiy Storchaka [Wed, 20 May 2015 15:29:18 +0000 (18:29 +0300)]
Issue #22955: attrgetter, itemgetter and methodcaller objects in the operator
module now support pickling.  Added readable and evaluable repr for these
objects.  Based on patch by Josh Rosenberg.

9 years agoIssue #24245: Eliminated senseless expect clauses that have no any effect in
Serhiy Storchaka [Wed, 20 May 2015 13:15:20 +0000 (16:15 +0300)]
Issue #24245: Eliminated senseless expect clauses that have no any effect in
IDLE.  Patch by Martin Panter.

9 years agoIssue #24245: Eliminated senseless expect clauses that have no any effect in
Serhiy Storchaka [Wed, 20 May 2015 13:15:02 +0000 (16:15 +0300)]
Issue #24245: Eliminated senseless expect clauses that have no any effect in
IDLE.  Patch by Martin Panter.

9 years agoIssue #24245: Eliminated senseless expect clauses that have no any effect.
Serhiy Storchaka [Wed, 20 May 2015 13:10:04 +0000 (16:10 +0300)]
Issue #24245: Eliminated senseless expect clauses that have no any effect.
Patch by Martin Panter.

9 years agoIssue #16261: Converted some bare except statements to except statements
Serhiy Storchaka [Wed, 20 May 2015 07:33:40 +0000 (10:33 +0300)]
Issue #16261: Converted some bare except statements to except statements
with specified exception type.  Original patch by Ramchandra Apte.

9 years agoIssue #22107: tempfile.gettempdir() and tempfile.mkdtemp() now try again
Serhiy Storchaka [Tue, 19 May 2015 21:14:00 +0000 (00:14 +0300)]
Issue #22107: tempfile.gettempdir() and tempfile.mkdtemp() now try again
when a directory with the chosen name already exists on Windows as well as
on Unix.  tempfile.mkstemp() now fails early if parent directory is not
valid (not exists or is a file) on Windows.

9 years agoIssue #22107: tempfile.gettempdir() and tempfile.mkdtemp() now try again
Serhiy Storchaka [Tue, 19 May 2015 21:11:48 +0000 (00:11 +0300)]
Issue #22107: tempfile.gettempdir() and tempfile.mkdtemp() now try again
when a directory with the chosen name already exists on Windows as well as
on Unix.  tempfile.mkstemp() now fails early if parent directory is not
valid (not exists or is a file) on Windows.

9 years agoFix some compilation warnings when using gcc (-Wmaybe-uninitialized).
Antoine Pitrou [Tue, 19 May 2015 19:06:04 +0000 (21:06 +0200)]
Fix some compilation warnings when using gcc (-Wmaybe-uninitialized).

9 years agoFix some compilation warnings when using gcc (-Wmaybe-uninitialized).
Antoine Pitrou [Tue, 19 May 2015 19:04:33 +0000 (21:04 +0200)]
Fix some compilation warnings when using gcc (-Wmaybe-uninitialized).

9 years agoIssue #23985: Fix a possible buffer overrun when deleting a slice from the front...
Antoine Pitrou [Tue, 19 May 2015 18:55:42 +0000 (20:55 +0200)]
Issue #23985: Fix a possible buffer overrun when deleting a slice from the front of a bytearray and then appending some other bytes data.

Patch by Martin Panter.

9 years agoIssue #23985: Fix a possible buffer overrun when deleting a slice from the front...
Antoine Pitrou [Tue, 19 May 2015 18:52:27 +0000 (20:52 +0200)]
Issue #23985: Fix a possible buffer overrun when deleting a slice from the front of a bytearray and then appending some other bytes data.

Patch by Martin Panter.

9 years agoNull merge.
R David Murray [Tue, 19 May 2015 12:25:28 +0000 (08:25 -0400)]
Null merge.

9 years ago#24215: also back out changeset that broke test_trace in 3.4.
R David Murray [Tue, 19 May 2015 12:24:59 +0000 (08:24 -0400)]
#24215: also back out changeset that broke test_trace in 3.4.

I missed that this change was applied to both branches.

9 years agoBack out changeset 955dffec3d94 since it broke the buildbots.
R David Murray [Tue, 19 May 2015 12:16:04 +0000 (08:16 -0400)]
Back out changeset 955dffec3d94 since it broke the buildbots.

and the situation has not been addressed in several days.

9 years ago#19662: fix typo
R David Murray [Tue, 19 May 2015 11:18:39 +0000 (07:18 -0400)]
#19662: fix typo

9 years agoIssue #23780: Improved error message in os.path.join() with single argument.
Serhiy Storchaka [Tue, 19 May 2015 08:00:07 +0000 (11:00 +0300)]
Issue #23780: Improved error message in os.path.join() with single argument.
Idea by R. David Murray.

9 years agoIssue #6598: Increased time precision and random number range in
Serhiy Storchaka [Tue, 19 May 2015 07:10:15 +0000 (10:10 +0300)]
Issue #6598: Increased time precision and random number range in
email.utils.make_msgid() to strengthen the uniqueness of the message ID.

9 years agoIssue #6598: Increased time precision and random number range in
Serhiy Storchaka [Tue, 19 May 2015 07:09:42 +0000 (10:09 +0300)]
Issue #6598: Increased time precision and random number range in
email.utils.make_msgid() to strengthen the uniqueness of the message ID.

9 years agoIssue 24205: Improve inspect.Signature.bind() error messages.
Yury Selivanov [Tue, 19 May 2015 04:27:49 +0000 (00:27 -0400)]
Issue 24205: Improve inspect.Signature.bind() error messages.

9 years agoIssue #24232: Fix typos. Patch by Ville Skyttä.
Berker Peksag [Mon, 18 May 2015 22:38:05 +0000 (01:38 +0300)]
Issue #24232: Fix typos. Patch by Ville Skyttä.

9 years agoIssue #24232: Fix typos. Patch by Ville Skyttä.
Berker Peksag [Mon, 18 May 2015 22:36:55 +0000 (01:36 +0300)]
Issue #24232: Fix typos. Patch by Ville Skyttä.

9 years agoIssue #24233: Add a proper link to socket.getfqdn() documentation.
Berker Peksag [Mon, 18 May 2015 22:31:24 +0000 (01:31 +0300)]
Issue #24233: Add a proper link to socket.getfqdn() documentation.

Patch by Ville Skyttä.

9 years agoIssue #24233: Add a proper link to socket.getfqdn() documentation.
Berker Peksag [Mon, 18 May 2015 22:31:00 +0000 (01:31 +0300)]
Issue #24233: Add a proper link to socket.getfqdn() documentation.

Patch by Ville Skyttä.

9 years agoFix Sphinx compile error.
Berker Peksag [Mon, 18 May 2015 22:28:07 +0000 (01:28 +0300)]
Fix Sphinx compile error.

../../Misc/NEWS:60: ERROR: Unknown target name: "mangle_from".

9 years agoFix typo in Misc/NEWS.
Berker Peksag [Mon, 18 May 2015 22:22:29 +0000 (01:22 +0300)]
Fix typo in Misc/NEWS.

9 years agoFix typo in Nisc/NEWS.
Berker Peksag [Mon, 18 May 2015 22:21:28 +0000 (01:21 +0300)]
Fix typo in Nisc/NEWS.

9 years agoFixed typos in comments.
Serhiy Storchaka [Mon, 18 May 2015 19:20:18 +0000 (22:20 +0300)]
Fixed typos in comments.

9 years agoFixed typos in comments.
Serhiy Storchaka [Mon, 18 May 2015 19:19:42 +0000 (22:19 +0300)]
Fixed typos in comments.

9 years agoIssue 24226: Fix parsing of many sequential one-line 'def' statements.
Yury Selivanov [Mon, 18 May 2015 16:50:52 +0000 (12:50 -0400)]
Issue 24226: Fix parsing of many sequential one-line 'def' statements.

9 years agoIssue #24091: Fixed various crashes in corner cases in C implementation of
Serhiy Storchaka [Mon, 18 May 2015 15:33:31 +0000 (18:33 +0300)]
Issue #24091: Fixed various crashes in corner cases in C implementation of
ElementTree.

9 years agoIssue #24091: Fixed various crashes in corner cases in C implementation of
Serhiy Storchaka [Mon, 18 May 2015 15:29:33 +0000 (18:29 +0300)]
Issue #24091: Fixed various crashes in corner cases in C implementation of
ElementTree.

9 years agoIssue #24102: Fixed exception type checking in standard error handlers.
Serhiy Storchaka [Mon, 18 May 2015 13:10:40 +0000 (16:10 +0300)]
Issue #24102: Fixed exception type checking in standard error handlers.

9 years agoIssue #24102: Fixed exception type checking in standard error handlers.
Serhiy Storchaka [Mon, 18 May 2015 13:08:52 +0000 (16:08 +0300)]
Issue #24102: Fixed exception type checking in standard error handlers.

9 years agoCloses #21931: Merge with 3.4
Zachary Ware [Mon, 18 May 2015 05:49:15 +0000 (00:49 -0500)]
Closes #21931: Merge with 3.4

9 years agoIssue #21931: Fix error handling in msilib.FCICreate().
Zachary Ware [Mon, 18 May 2015 05:47:15 +0000 (00:47 -0500)]
Issue #21931: Fix error handling in msilib.FCICreate().

Patch by Jeffrey Armstrong.

9 years agoIssue #23488: Fix a syntax error on big endian platforms.
Zachary Ware [Mon, 18 May 2015 04:46:22 +0000 (23:46 -0500)]
Issue #23488: Fix a syntax error on big endian platforms.

Hopefully this will allow the PPC64 PowerLinux buildbot to finish a test run.

9 years agoIssue #21337: Add bare-bones Tix test
Zachary Ware [Mon, 18 May 2015 01:55:42 +0000 (20:55 -0500)]
Issue #21337: Add bare-bones Tix test

All this does is confirm that Tix is available on Windows, which should
always be the case (if _tkinter itself is available).

9 years agoIssue #13866: add *quote_via* argument to urlencode.
R David Murray [Mon, 18 May 2015 00:44:50 +0000 (20:44 -0400)]
Issue #13866: add *quote_via* argument to urlencode.

Patch by samwyse, completed by Arnon Yaari, and reviewed by
Martin Panter.

9 years ago#24211: Add missing docs for SMTPUTF8 policy instance.
R David Murray [Sun, 17 May 2015 23:36:16 +0000 (19:36 -0400)]
#24211: Add missing docs for SMTPUTF8 policy instance.

9 years ago#24218: Add SMTPUTF8 support to send_message.
R David Murray [Sun, 17 May 2015 23:27:22 +0000 (19:27 -0400)]
#24218: Add SMTPUTF8 support to send_message.

Reviewed by Maciej Szulik.

9 years agomerge
Raymond Hettinger [Sun, 17 May 2015 21:47:00 +0000 (14:47 -0700)]
merge

9 years agoIssue #23757: Only call the concrete list API for exact lists.
Raymond Hettinger [Sun, 17 May 2015 21:45:58 +0000 (14:45 -0700)]
Issue #23757:  Only call the concrete list API for exact lists.

9 years agoIssue #22155: News entry.
Terry Jan Reedy [Sun, 17 May 2015 18:56:20 +0000 (14:56 -0400)]
Issue #22155: News entry.

9 years agoIssue #22155: News entry.
Terry Jan Reedy [Sun, 17 May 2015 18:53:28 +0000 (14:53 -0400)]
Issue #22155: News entry.

9 years agoMerge with 3.4
Terry Jan Reedy [Sun, 17 May 2015 18:50:06 +0000 (14:50 -0400)]
Merge with 3.4

9 years agoIssue #22155: Add File Handlers subsection with createfilehandler to tkinter
Terry Jan Reedy [Sun, 17 May 2015 18:49:26 +0000 (14:49 -0400)]
Issue #22155: Add File Handlers subsection with createfilehandler to tkinter
doc.  Remove obsolete example from FAQ.  Patch by Martin Panter.

9 years ago#20098: add mangle_from_ policy option.
R David Murray [Sun, 17 May 2015 18:24:33 +0000 (14:24 -0400)]
#20098: add mangle_from_ policy option.

This defaults to True in the compat32 policy for backward compatibility,
but to False for all new policies.

Patch by Milan Oberkirch, with a few tweaks.

9 years ago#24211: Add RFC6532 support to the email library.
R David Murray [Sun, 17 May 2015 15:29:21 +0000 (11:29 -0400)]
#24211: Add RFC6532 support to the email library.

This could use more edge case tests, but the basic functionality is tested.
(Note that this changeset does not add tailored support for the RFC 6532
message/global MIME type, but the email package generic facilities will handle
it.)

Reviewed by Maciej Szulik.

9 years agoMerge: #24216: fix typo
R David Murray [Sun, 17 May 2015 14:17:35 +0000 (10:17 -0400)]
Merge: #24216: fix typo

9 years ago#24216: fix typo
R David Murray [Sun, 17 May 2015 14:16:37 +0000 (10:16 -0400)]
#24216: fix typo

9 years agoIgnore PCbuild/.vs directory.
Zachary Ware [Sun, 17 May 2015 03:45:27 +0000 (22:45 -0500)]
Ignore PCbuild/.vs directory.

Also fix a couple other ignored PCbuild directories in .gitignore

9 years agoMerge with 3.4
Terry Jan Reedy [Sat, 16 May 2015 23:33:32 +0000 (19:33 -0400)]
Merge with 3.4

9 years agoIssue #24199: Make idlever module self updating. Syop using it in aboutDialog.
Terry Jan Reedy [Sat, 16 May 2015 23:28:32 +0000 (19:28 -0400)]
Issue #24199: Make idlever module self updating. Syop using it in aboutDialog.

9 years agoFixed issue #16314 test for the case when lzma is not available.
Serhiy Storchaka [Sat, 16 May 2015 23:23:02 +0000 (02:23 +0300)]
Fixed issue #16314 test for the case when lzma is not available.

9 years agoMerge with 3.4
Terry Jan Reedy [Sat, 16 May 2015 22:31:32 +0000 (18:31 -0400)]
Merge with 3.4

9 years agoIssue #24212: Put reference in idle.__main__ to issue with explanation.
Terry Jan Reedy [Sat, 16 May 2015 22:31:15 +0000 (18:31 -0400)]
Issue #24212: Put reference in idle.__main__ to issue with explanation.

9 years agoAdd versionadded directive for BoundArguments.apply_defaults().
Berker Peksag [Sat, 16 May 2015 20:29:31 +0000 (23:29 +0300)]
Add versionadded directive for BoundArguments.apply_defaults().

9 years agoIssue #24210: Silence more PendingDeprecationWarning warnings in tests.
Berker Peksag [Sat, 16 May 2015 20:21:26 +0000 (23:21 +0300)]
Issue #24210: Silence more PendingDeprecationWarning warnings in tests.

9 years ago#21083: add get_content_disposition method to email.message.
R David Murray [Sat, 16 May 2015 19:41:07 +0000 (15:41 -0400)]
#21083: add get_content_disposition method to email.message.

Patch by Abhilash Raj.

9 years agoIssue #16314: Added support for the LZMA compression in distutils.
Serhiy Storchaka [Sat, 16 May 2015 19:13:27 +0000 (22:13 +0300)]
Issue #16314: Added support for the LZMA compression in distutils.

9 years ago#21804: Add RFC 6856 (UTF8) support to poplib.
R David Murray [Sat, 16 May 2015 19:05:53 +0000 (15:05 -0400)]
#21804: Add RFC 6856 (UTF8) support to poplib.

Patch by Milan Oberkirch.

9 years agoIssue #18682: Optimized pprint functions for builtin scalar types.
Serhiy Storchaka [Sat, 16 May 2015 18:38:05 +0000 (21:38 +0300)]
Issue #18682: Optimized pprint functions for builtin scalar types.

9 years agoAdded tests for more builtin types.
Serhiy Storchaka [Sat, 16 May 2015 18:35:56 +0000 (21:35 +0300)]
Added tests for more builtin types.
Made test_pprint discoverable.

9 years agoAdded tests for more builtin types.
Serhiy Storchaka [Sat, 16 May 2015 18:35:24 +0000 (21:35 +0300)]
Added tests for more builtin types.
Made test_pprint discoverable.

9 years agoMerge with 3.4
Terry Jan Reedy [Sat, 16 May 2015 18:24:06 +0000 (14:24 -0400)]
Merge with 3.4

9 years agoIssue #23964: Update idlelib/idle_test/README.txt. first patch by Al Sweigart.
Terry Jan Reedy [Sat, 16 May 2015 18:23:39 +0000 (14:23 -0400)]
Issue #23964: Update idlelib/idle_test/README.txt. first patch by Al Sweigart.

9 years ago#19662: Make requirement to support arbitrary keywords explicit.
R David Murray [Sat, 16 May 2015 18:16:33 +0000 (14:16 -0400)]
#19662: Make requirement to support arbitrary keywords explicit.

When not using decode_data=True, smtpd may provide keyword arguments to the
process_message user-implemented method.  This doc update is intended to make
it clear that arbitrary keywords must be supported, so that we can add
additional features in the future by just adding keywords to the
process_message call.

9 years ago#22027: Add RFC6531 support to smtplib.
R David Murray [Sat, 16 May 2015 17:58:14 +0000 (13:58 -0400)]
#22027: Add RFC6531 support to smtplib.

Initial patch by Milan Oberkirch.

9 years agoIssue 24190: Add inspect.BoundArguments.apply_defaults() method.
Yury Selivanov [Sat, 16 May 2015 17:45:09 +0000 (13:45 -0400)]
Issue 24190: Add inspect.BoundArguments.apply_defaults() method.

9 years agoIssue #24210: Silence a PendingDeprecationWarning warning in platform.platform().
Berker Peksag [Sat, 16 May 2015 17:24:28 +0000 (20:24 +0300)]
Issue #24210: Silence a PendingDeprecationWarning warning in platform.platform().

9 years agoIssue 24208: Fix tests -- don't create a tempdir in __init__.
Yury Selivanov [Sat, 16 May 2015 14:10:21 +0000 (10:10 -0400)]
Issue 24208: Fix tests -- don't create a tempdir in __init__.

9 years agoallow test node after ** in calls (closes #24176)
Benjamin Peterson [Sat, 16 May 2015 13:44:45 +0000 (09:44 -0400)]
allow test node after ** in calls (closes #24176)

9 years agoFixed release date.
Serhiy Storchaka [Sat, 16 May 2015 13:32:21 +0000 (16:32 +0300)]
Fixed release date.

9 years agoNull merge
Serhiy Storchaka [Sat, 16 May 2015 13:31:35 +0000 (16:31 +0300)]
Null merge

9 years agoIssue #24134: assertRaises(), assertRaisesRegex(), assertWarns() and
Serhiy Storchaka [Sat, 16 May 2015 13:29:50 +0000 (16:29 +0300)]
Issue #24134: assertRaises(), assertRaisesRegex(), assertWarns() and
assertWarnsRegex() checks now emits a deprecation warning when callable is
None or keyword arguments except msg is passed in the context manager mode.

9 years agoReverted issue #24134 changes (except new tests).
Serhiy Storchaka [Sat, 16 May 2015 13:25:43 +0000 (16:25 +0300)]
Reverted issue #24134 changes (except new tests).

9 years agoFixed compilation error in signalmodule.c (issue #20182).
Serhiy Storchaka [Sat, 16 May 2015 12:57:56 +0000 (15:57 +0300)]
Fixed compilation error in signalmodule.c (issue #20182).

9 years agoIssue #20182: converted the signal module to use Argument Clinic
Tal Einat [Sat, 16 May 2015 11:14:49 +0000 (14:14 +0300)]
Issue #20182: converted the signal module to use Argument Clinic

9 years agoArgument Clinic: added missing bit of info in howto
Tal Einat [Sat, 16 May 2015 11:12:15 +0000 (14:12 +0300)]
Argument Clinic: added missing bit of info in howto

9 years agoTighten-up code by eliminating an unnecessary variable.
Raymond Hettinger [Sat, 16 May 2015 04:01:13 +0000 (21:01 -0700)]
Tighten-up code by eliminating an unnecessary variable.

9 years agoIssue #23184: idle tests, remove unused names and imports.
Terry Jan Reedy [Sat, 16 May 2015 03:55:21 +0000 (23:55 -0400)]
Issue #23184: idle tests, remove unused names and imports.

9 years agoIssue #24192: Fix namespace package imports.
Eric Snow [Sat, 16 May 2015 03:54:59 +0000 (21:54 -0600)]
Issue #24192: Fix namespace package imports.

9 years agoMerge 3.4 #23184: idle tests, remove unused names and imports.
Terry Jan Reedy [Sat, 16 May 2015 03:55:49 +0000 (23:55 -0400)]
Merge 3.4 #23184: idle tests, remove unused names and imports.

9 years agoMerge with 3.4 Issue #23184: idlelib, remove more unused names and imports.
Terry Jan Reedy [Sat, 16 May 2015 03:03:53 +0000 (23:03 -0400)]
Merge with 3.4 Issue #23184: idlelib, remove more unused names and imports.

9 years agoIssue #23184: idlelib, remove more unused names and imports.
Terry Jan Reedy [Sat, 16 May 2015 03:03:17 +0000 (23:03 -0400)]
Issue #23184: idlelib, remove more unused names and imports.

9 years agoMinor code clean-up.
Raymond Hettinger [Sat, 16 May 2015 00:53:52 +0000 (17:53 -0700)]
Minor code clean-up.

9 years agoIssue #24064: Docuement that oroperty docstrings are now writeable.
Raymond Hettinger [Fri, 15 May 2015 23:17:05 +0000 (16:17 -0700)]
Issue #24064:  Docuement that oroperty docstrings are now writeable.

9 years agoFixes default per-user install precompiling the standard library.
Steve Dower [Fri, 15 May 2015 19:10:53 +0000 (12:10 -0700)]
Fixes default per-user install precompiling the standard library.

9 years agoIssue 24200: Fix broken unittest.
Yury Selivanov [Fri, 15 May 2015 16:55:20 +0000 (12:55 -0400)]
Issue 24200: Fix broken unittest.

9 years agoinspect: Remove "0x..." IDs from Signature objects' __repr__
Yury Selivanov [Fri, 15 May 2015 16:53:56 +0000 (12:53 -0400)]
inspect: Remove "0x..." IDs from Signature objects' __repr__

Issue 24200.

9 years agoCloses #24013: Improve os.scandir() and DirEntry documentation
Victor Stinner [Fri, 15 May 2015 07:12:58 +0000 (09:12 +0200)]
Closes #24013: Improve os.scandir() and DirEntry documentation

Patch written by Ben Hoyt.

9 years agoos module doc: remove availability when useless
Victor Stinner [Fri, 15 May 2015 07:11:59 +0000 (09:11 +0200)]
os module doc: remove availability when useless

Remove "Availability: Unix, Windows." from os module documentation for
functions available on all platforms.

9 years agoIssue 22547: Implement informative __repr__ for inspect.BoundArguments
Yury Selivanov [Thu, 14 May 2015 22:47:17 +0000 (18:47 -0400)]
Issue 22547: Implement informative __repr__ for inspect.BoundArguments

9 years agoMerge
Yury Selivanov [Thu, 14 May 2015 22:33:14 +0000 (18:33 -0400)]
Merge