Merge branch 'master' into scheduler
authorJordan Augé <jordan.auge@lip6.fr>
Fri, 29 Nov 2013 09:30:26 +0000 (10:30 +0100)
committerJordan Augé <jordan.auge@lip6.fr>
Fri, 29 Nov 2013 09:30:26 +0000 (10:30 +0100)
commit03839166e30819c37290f33056f44aaee1583bfc
tree17944f777baea4d057cfedf49bfba587ddf67aea
parent371ac3cd748e44a973ec81eebc3d2ac69c34ccf1
parentf19bceaa080ab47bae751cd0597a9fb32d1b6b4f
Merge branch 'master' into scheduler

Conflicts:
plugins/googlemap/static/js/googlemap.js
plugins/googlemap/static/js/googlemap.js
portal/sliceview.py