Merge commit '8feedde68f3a3756f56da44ef4a41af9b5d3e48f' into 7.x
Squashed 'profiles/kalaxy/' changes from 9386621..fcf6dca

fcf6dca New: Add modules/base/ds, 7.x-2.x.
a07b666 Merge commit 'd7b5408d47b36f1dd8a5fc66a0c9ad0068f48ad3' as 'modules/base/ds'
d7b5408 Squashed 'modules/base/ds/' content from commit 1640acd
5a55996 New: Add modules/base/entity, 7.x-1.5.
3004af1 Merge commit 'bf99d5e053881ed1b70486ba94aaf72f8c5ce5a7' as 'modules/base/entity'
bf99d5e Squashed 'modules/base/entity/' content from commit 967773e
73fcbd8 New: Add modules/base/ctools 7.x-1.4.
9a42891 Merge commit '96a3f0370e5f6cb0c7ef0342537b0903de1615df' as 'modules/base/ctools'
96a3f03 Squashed 'modules/base/ctools/' content from commit 5438b40
161fe19 New: Add .gitignore.

git-subtree-dir: profiles/kalaxy
git-subtree-split: fcf6dca7185980dc0e7b04108786042dfb29b137
New: Add .gitignore.
Squashed 'profiles/kalaxy/' changes from fcf6dca..0c2c9f0

0c2c9f0 Merge commit 'c83790f9a2037ceca63bbc357e8e2c712890e319' as 'themes/admin/shiny'
c83790f Squashed 'themes/admin/shiny/' content from commit eaa29b9
94765a0 Merge commit '28768bd6b6f16ba5416f2448d462b976f7fdf1e0' as 'modules/feature/body_field_definition'
28768bd Squashed 'modules/feature/body_field_definition/' content from commit de53c85
c632288 Merge commit '9777503f6368079259d2193ebc09364d819c42de' as 'modules/common/views_tree'
9777503 Squashed 'modules/common/views_tree/' content from commit 7dd712b
a699b51 Merge commit '1ca16454a8530fd2ea88852d7294c5fded9eb8a2' as 'modules/common/taxonomy_manager'
1ca1645 Squashed 'modules/common/taxonomy_manager/' content from commit 22ce9c4
b123883 Merge commit '52e65df688e5913b1ba246281b7a14e9ca9db217' as 'modules/common/multiform'
52e65df Squashed 'modules/common/multiform/' content from commit 9a78be4
0da2657 Merge commit '08145b755bfb0962ae88ff7848a9605aba53dd83' as 'modules/common/media_browser_plus'
08145b7 Squashed 'modules/common/media_browser_plus/' content from commit 0671064
e66b260 Merge commit 'b858b2fa1155edcafb314425c4d23fd597e76016' as 'modules/common/filefield_sources'
b858b2f Squashed 'modules/common/filefield_sources/' content from commit 0c41206
15bced9 Merge commit '013880370a557964caff3911901b93f1af4ddf62' as 'modules/common/filefield_paths'
0138803 Squashed 'modules/common/filefield_paths/' content from commit 8b39e73
3c99e0c Merge commit 'f61051f5413acf1383ac0a8bc3f7258f2af66ccd' as 'modules/common/field_conditional_state'
f61051f Squashed 'modules/common/field_conditional_state/' content from commit 58506e5
67928a0 Merge commit '5fe96e7695dc1aacbf526e94778b54ef46a8853f' as 'modules/common/entityreference_autocomplete'
5fe96e7 Squashed 'modules/common/entityreference_autocomplete/' content from commit 63c922f
8a9c604 Merge commit 'cdf257d40d7f1745eb7faaa08afb4afcf24f4505' as 'modules/common/multiupload_imagefield_widget'
cdf257d Squashed 'modules/common/multiupload_imagefield_widget/' content from commit 7ff8886
4bd2ca6 Merge commit '5cfc51eaa31202e88e13256ddf60f03a2f6f31b1' as 'modules/common/multiupload_filefield_widget'
5cfc51e Squashed 'modules/common/multiupload_filefield_widget/' content from commit 201ca6a
c48e741 New: Add simple_html_dom library file.
af7e634 Merge commit '984fda99cce2b34ca29b08a936c6d34771a5c84f' as 'modules/base/views_bulk_operations'
984fda9 Squashed 'modules/base/views_bulk_operations/' content from commit 38dfd2d
efda5ae Merge commit '4a552ee9f0b80e60dd335fabd55f21992198800b' as 'modules/base/views'
4a552ee Squashed 'modules/base/views/' content from commit dd71192
0aaafe4 Merge commit '9f53c68cd6b8c13910b70b07b3cb0caff305e0d5' as 'modules/base/url'
9f53c68 Squashed 'modules/base/url/' content from commit cb7a9ee
ffe0de8 Merge commit '5777242a6e8caeb0de75ccaa27c568c5e140fbfb' as 'modules/base/token'
5777242 Squashed 'modules/base/token/' content from commit 72f3d17
e1f9157 Merge commit 'ae6fd366cb09f52ebadabd5435735b7165fbfac8' as 'modules/base/strongarm'
ae6fd36 Squashed 'modules/base/strongarm/' content from commit 5a2326b
f734a83 Merge commit '2f98bfcdabe22a0817793be03f8c61001e1fac17' as 'modules/base/simplehtmldom'
2f98bfc Squashed 'modules/base/simplehtmldom/' content from commit c05077a
4c7dc8f Merge commit 'e820c32555d9abbdc31bc6c0903085f932b5e7b5' as 'modules/base/services'
e820c32 Squashed 'modules/base/services/' content from commit 6416c84
fffdbb2 Merge commit 'df5545307a071aa2ba9affd7b34b6fb588dd6148' as 'modules/base/serial'
df55453 Squashed 'modules/base/serial/' content from commit b1c920e
93a3a04 Merge commit '147b394741d833d7372c203e3f73af386887185f' as 'modules/base/rules'
147b394 Squashed 'modules/base/rules/' content from commit 0a56a35
08e4ad5 Merge commit '6d2a0bbcea563bc88f2ed17d6700755973fa826c' as 'modules/base/relation'
6d2a0bb Squashed 'modules/base/relation/' content from commit 5b8e243
a3dd910 Merge commit 'bad945448eb4d3fbfe20ef44d3f72fab6dcd5240' as 'modules/base/redirect'
bad9454 Squashed 'modules/base/redirect/' content from commit 6957f39
671dfb5 Merge commit 'bcde8e45f685326d9d6d892908fd5d2618716939' as 'modules/base/pathologic'
bcde8e4 Squashed 'modules/base/pathologic/' content from commit 8badaf2
52151af Merge commit 'aca65f7a2742b502d9aada8f18313a057ce2bb87' as 'modules/base/pathauto'
aca65f7 Squashed 'modules/base/pathauto/' content from commit f98f632
f959fd2 Merge commit '087e1cfa2651570f76ecb3b8b78b552fbf0f3f87' as 'modules/base/og'
087e1cf Squashed 'modules/base/og/' content from commit b68a13f
81aeb3e Merge commit 'a8f23c1c3f52e980170608bf85e07f2a194c008f' as 'modules/base/name'
a8f23c1 Squashed 'modules/base/name/' content from commit dbb981c
d5f9104 Merge commit '28677a52c49636d20c501e25305906409d55474c' as 'modules/base/module_filter'
28677a5 Squashed 'modules/base/module_filter/' content from commit c7fd7f5
1bc866d Merge commit 'f36564414cc4f90028cb6aca6953debf109c5c18' as 'modules/base/media'
f365644 Squashed 'modules/base/media/' content from commit 9e3207f
0efbfbc Merge commit '2c4011e46fd3b3d8a5d65a321ed86ed14c6df910' as 'modules/base/machine_name'
2c4011e Squashed 'modules/base/machine_name/' content from commit 94b7446
f3b2d00 Merge commit '7090c59ad6bbf3c744ba61343c4fdbe16ed88d5d' as 'modules/base/link'
7090c59 Squashed 'modules/base/link/' content from commit 7dc306c
2292a49 Merge commit '8eba73715de8e6497349a4d4069328c1f28b53a3' as 'modules/base/libraries'
8eba737 Squashed 'modules/base/libraries/' content from commit 744cd04
1054a3a Merge commit 'a426b8e34bf3fa7d13b6eed4dbc1fa4e4dacbe47' as 'modules/base/globalredirect'
a426b8e Squashed 'modules/base/globalredirect/' content from commit e7debe9
55f35ab Merge commit '8c27e082dd75039d775f454310f37e84914c78d5' as 'modules/base/file_entity'
8c27e08 Squashed 'modules/base/file_entity/' content from commit 1e037ad
ed308c4 New: Add modules/field_group, 7.x-1.4
f953cea Merge commit '813a19d6715e79b72dac481297d004eb58f5a005' as 'modules/base/field_group'
813a19d Squashed 'modules/base/field_group/' content from commit 1c4f459
4daada6 New: Add modules/base/field_collection, 7.x-1.x
15d01f8 Merge commit 'af496082a5b5bde325dfd17b1aeac474c967acce' as 'modules/base/field_collection'
af49608 Squashed 'modules/base/field_collection/' content from commit 40072ad
303f5cc New: Add modules/base/features, 7.x-2.2
3ed8d75 Merge commit 'fc7a8343e912200129049047d59a54017b4924b3' as 'modules/base/features'
fc7a834 Squashed 'modules/base/features/' content from commit 9f4ecc7
bf8c57f New: Add modules/base/entityreference, 7.x-1.1
5fa2050 Merge commit 'cf94e8366a6e76a2b9b43e83b8b4e1ce8db61a23' as 'modules/base/entityreference'
cf94e83 Squashed 'modules/base/entityreference/' content from commit 92747d9
651b6f9 New: Add modules/base/entitycache, 7.x-1.x
9e5064f Merge commit '444c493c371ccd2a20d91a729deefcab386ae725' as 'modules/base/entitycache'
444c493 Squashed 'modules/base/entitycache/' content from commit ea31dc9
084d91a New: Add modules/base/eck, 7.x-2.x.
bdff676 Merge commit 'f8017dbdf510331ca4fedc1a6db8ff9f029ffeb2' as 'modules/base/eck'
f8017db Squashed 'modules/base/eck/' content from commit 6b2be8f

git-subtree-dir: profiles/kalaxy
git-subtree-split: 0c2c9f09fe8d62b5b34c8894df83517e45545134
Merge commit '73f6bfd11fc957622835fed0d00031f09ed23043' into 7.x