{"shas":[["971612661c185ec48ad40c9b6af5212d99a1608e","9f14b0c6fe50124b9bb30d6c727d717e8f4ca9e6@diamond.ac.uk","small changes to make this work for the merge.","Mark Basham"],["88cbb7834b0e2b8eca1e02cb5de9bd16ffba5eb5","9f14b0c6fe50124b9bb30d6c727d717e8f4ca9e6@diamond.ac.uk","Merge commit 'pydev_2_1_0' into upgradeto2_1\n\nConflicts:\n\tbuilders/org.python.pydev.build/customTargets.xml\n\tplugins/org.python.pydev.core/src/org/python/pydev/core/log/Log.java\n\tplugins/org.python.pydev.debug/src_console/org/python/pydev/debug/newconsole/PydevConsoleCompletionProcessor.java\n\tplugins/org.python.pydev/src/org/python/pydev/editor/codefolding/PyEditProjection.java\n\tplugins/org.python.pydev/src/org/python/pydev/ui/interpreters/AbstractInterpreterManager.java\n\tplugins/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/CompletionError.java","Mark Basham"],["6d6cdb6fd57124d74617e989edbf4490cb57e22a","9f14b0c6fe50124b9bb30d6c727d717e8f4ca9e6@diamond.ac.uk","resolved merge error in xml","Mark Basham"]],"ref":"refs/heads/opengdatrunk","size":3,"head":"6d6cdb6fd57124d74617e989edbf4490cb57e22a","push_id":32826114}