Merge remote-tracking branch 'upstream/master'

This commit is contained in:
John Wood 2013-05-08 12:01:54 -05:00
commit f12df4bfdd
2 changed files with 3 additions and 3 deletions

View File

@ -17,5 +17,5 @@
Cloudkeep's Barbican version
"""
__version__ = '0.1.37dev'
__version__ = '0.1.38dev'
__version_info__ = tuple(__version__.split('.'))

4
debian/changelog vendored
View File

@ -1,5 +1,5 @@
barbican (0.1.37dev-1) stable; urgency=high
barbican (0.1.38dev-1) stable; urgency=high
* Updated version.
-- John Wood <john.wood@rackspace.com> Tue, 07 May 2013 16:35:32 -0500
-- John Wood <john.wood@rackspace.com> Tue, 07 May 2013 17:33:35 -0500