Frank Celler f9dba124dd Merge remote-tracking branch 'origin/issue317' into 1.1 ... Conflicts: js/common/bootstrap/modules.js		2013-01-03 18:57:18 +01:00
..
org	Merge remote-tracking branch 'origin/issue317' into 1.1	2013-01-03 18:57:18 +01:00
simple-query.js	issue #153: edge collection should be a flag for a collection	2012-08-28 10:48:24 +02:00