« Previous | Next » 

Revision 25f9901f

ID25f9901f29c9e5fe372aa54023b4097ec96b2233
Parent 6839a874, b8f31860
Child b397a7d2

Added by Iustin Pop almost 13 years ago

Merge commit 'origin/next' into branch-2.1

Conflicts:
lib/cli.py: trivial extra empty line

Files

  • added
  • modified
  • copied
  • renamed
  • deleted