[eclipse-pydev/f19: 2/2] Merge remote-tracking branch 'origin/master' into f19

[Alexander Kurtakov]

commit fdb243c29db76b70320542a4fc90abe600346db0
Merge: f667edc 484bdc2
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Fri Jul 26 16:48:30 2013 +0300

    Merge remote-tracking branch 'origin/master' into f19

 .gitignore                |    1 +
 eclipse-pydev.spec        |   33 ++++++++++++++++++---------------
 pydev-remove-jython.patch |    2 +-
 sources                   |    1 +
 4 files changed, 21 insertions(+), 16 deletions(-)
---