tree a23ac4d9da0a3de1e6754b351a07b4840ed9c9e1
parent 8c07b5d842da7835e79568835a827c051412ea9b
parent 8760c31f8a8fc38213e65430bfe8b38f1eb7ffd5
author Alex Ruiz <alruiz@google.com> 1320792307 -0800
committer Alex Ruiz <alruiz@google.com> 1320792307 -0800

Merge branch 'master' of https://code.google.com/p/protobuf-dt/

Conflicts:
	com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/ProtobufRuntimeModule.java
	com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/validation/ProtobufResourceValidator.java