Viewing all changes in revision 310.

Committer: Jesús Barbero Rodríguez
Date: 2012-04-08 15:40:37 UTC
mfrom: <a title="Merged From 308.1.2" href="/~chuchiperriman/cloudsn/master/revision/308.1.2">(308.1.2)
Revision ID: git-v1:12643705706e59f145e3c3bf37e5ca3362654f36

Merge branch 'master' of github.com:chuchiperriman/cloud-services-notifications

Conflicts:
src/cloudsn/const.py

added added

removed removed

~chuchiperriman/cloudsn/master