tree ac32fc86e9435254193d0a1741b934bbd480815f
parent 291bfce8e47e2aa1add78a65c4009be2ddb2d355
parent d99ad28f3571f7c809b780dfb1e84842fc08ac18
author Alex Ruiz <alruiz@google.com> 1316755853 -0700
committer Alex Ruiz <alruiz@google.com> 1316755853 -0700

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

Conflicts:
	com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/ProtoDescriptor.java